--- summary
+++ summary
@@ -1,15 +1,13 @@
 Test Suite: ERP5-MASTER
-Revision: slapos.cookbook=10939-c05514c5ff07aa2be2f784ffb692661168770ab6,erp5=49680-9c8400c8e354b16e25e03bc1b32ec6f31d20986e
+Revision: slapos.cookbook=10939-c05514c5ff07aa2be2f784ffb692661168770ab6,erp5=49682-96abb6ce0a29d7751e05e8cd9364f1fe34055888
 Result: FAIL
-
-Building Failed
 
 All tests: 5989
 Failures: 3
-Errors: 2
+Errors: 0
 Skips: 201
 
- https://nexedi.erp5.net/test_result_module/20181101-4606B808/view
+ https://nexedi.erp5.net/test_result_module/20181101-5B5F4BFB/view
 
 
 The following tests failed:
@@ -19,10 +17,6 @@
 
   testFunctionalConfigurator                         (1 failures)
    testFunctionalTestRunner (testFunctionalConfigurator.TestZeleniumConfiguratorStandard)
-
-  test_conflict_resolution:testConflictResolution    (2 errors)
-   testActiveProcess (erp5.component.test.erp5_version.testConflictResolution.TestERP5)
-   testZODBCookie (erp5.component.test.erp5_version.testConflictResolution.TestERP5)
 
 The following tests were at least partly skipped: