DEV: restructure tests: add test type descriptions

# Conflicts: # tests/acceptance/README.md
LimeSurvey · Jan 9, 2018 · a7229ad · a7229ad
1 parent 4e08439
commit a7229ad
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tests/acceptance/admin/TemplateConfigurationTest.php b/tests/acceptance/admin/TemplateConfigurationTest.php
@@ -1,11 +1,7 @@
 <?php
 namespace ls\tests\acceptance\admin;
 
-<<<<<<< HEAD:tests/models/TemplateConfigurationTest.php
-namespace ls\tests;
-=======
 use ls\tests\TestBaseClass;
->>>>>>> 10b0e2b... DEV: restructure tests: move Models tests:tests/acceptance/admin/TemplateConfigurationTest.php
 
 /**
  * @since 2017-06-13