fix conflict trace

plone · Sep 27, 2018 · a79e162 · a79e162
1 parent aafe823
commit a79e162
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/plone/app/testing/bbb_at.py b/src/plone/app/testing/bbb_at.py
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
-<<<<<<< HEAD:src/plone/app/testing/bbb_at.py:src/plone/app/testing/bbb_at.py
 """Backwards-compatibility test class for PloneTestCase for Archetypes."""
-=======
-"""Backwards-compatibility test class for PloneTestCase for Dexterity."""
->>>>>>> master:plone/app/testing/bbb.py:plone/app/testing/bbb.py
 
 from AccessControl import getSecurityManager
 from plone.app import testing