Update test.conf.js

Author: ProLoser

tests/test.conf.js

@@ -2,18 +2,11 @@ basePath = '..';
 files = [
   JASMINE,
   JASMINE_ADAPTER,
-<<<<<<< HEAD
   'components/jquery/jquery.js',
   'components/angular/angular.js',
   'components/angular-mocks/angular-mocks.js',
   'components/select2/select2.js',
   'src/*.js',
   'tests/*.js'
-=======
-  'libs/angular.js/angular.js',
-  'libs/select2/select2.js',
-  'tests/*.js',
-  '*.js'
->>>>>>> 92733e3ba9527423adc5e7433cd6918590f04e65
 ];
-runOnce = true;
+runOnce = true;