//jshint strict: false
module.exports = function(config) {
  config.set({

    basePath: './app',
	frameworks: ['jasmine'],
    files: [
	    'lib/jquery.min.js',
      'lib/angular.min.js',
      'lib/angular-route.min.js',
      'lib/angular-mocks.js',
<<<<<<< HEAD
	    'lib/firebase.js',
	    'lib/angularfire.min.js',	  
	    'app.signup_and_login.js',
	    'app.js',
      'unit_tests/test_login.js',
			'randomEvent.js'	  
    ],
	exclude: [
	],
	preprocessors: {	 	
		 'app.signup_and_login.js' : ['coverage'],
		 'randomEvent.js' : ['coverage']
=======
	  'lib/firebase.js',
	  'lib/angularfire.min.js',
    'http://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.8/angular-ui-router.min.js',
	  'app.js',
    'app.route.js',
	  'app.signup_and_login.js',

      'unit_tests/test_login.js'	  
    ],
	exclude: [
	],
	preprocessors: {
    'app.js' : ['coverage'],
		 'app.signup_and_login.js' : ['coverage']
>>>>>>> 52b51433d3f918c09bbb373d17303243aefbcf3e
	},
	reporters: ['progress', 'coverage'],
	coverageReporter: {
			type: 'html',
			dir: 'coverage/',
			subdir: '.'
	},
	port: 8080,
	colors: true,
    browsers: ['Chrome'],
	singleRun: true,
    plugins: [
      'karma-chrome-launcher',      
      'karma-jasmine',
	    'karma-coverage'
    ]    

  });
};

@@ -52,16 +52,18 @@
 nfig) %7B%0A
+  
   config
@@ -70,16 +70,20 @@
 .set(%7B%0A%0A
+    
     base
@@ -97,17 +97,24 @@
 ./app',%0A
-%09
+        
 framewor
@@ -130,16 +130,20 @@
 mine'%5D,%0A
+    
     file
@@ -147,17 +147,24 @@
 iles: %5B%0A
-%09
+        
     'lib
@@ -178,32 +178,38 @@
 .min.js',%0A      
+     
+ 
 'lib/angular.min
@@ -206,32 +206,38 @@
 ngular.min.js',%0A
+      
       'lib/angul
@@ -256,24 +256,30 @@
 .js',%0A      
+    
+  
 'lib/angular
@@ -294,22 +294,16 @@
 s',%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A%09
+        
     
@@ -317,25 +317,32 @@
 rebase.js',%0A
-%09
+        
     'lib/ang
@@ -362,13 +362,17 @@
 js',
-%09  %0A%09
+%0A        
     
@@ -398,17 +398,24 @@
 in.js',%0A
-%09
+        
     'app
@@ -416,24 +416,30 @@
   'app.js',%0A
+      
       'unit_
@@ -460,19 +460,28 @@
 in.js',%0A
-%09%09%09
+            
 'randomE
@@ -484,36 +484,44 @@
 domEvent.js'
-%09
+%0A  
   
-%0A
     %5D,%0A
-%09
+        
 exclude: %5B%0A%09
@@ -510,38 +510,43 @@
       exclude: %5B
-%0A%09
 %5D,%0A
-%09
+        
 preprocessors: %7B
@@ -549,14 +549,20 @@
 s: %7B
-%09 %09%0A%09%09
+%0A           
  'ap
@@ -575,33 +575,32 @@
 up_and_login.js'
- 
 : %5B'coverage'%5D,%0A
@@ -599,18 +599,27 @@
 rage'%5D,%0A
-%09%09
+           
  'random
@@ -623,25 +623,24 @@
 domEvent.js'
- 
 : %5B'coverage
@@ -646,429 +646,27 @@
 e'%5D%0A
-=======%0A%09  'lib/firebase.js',%0A%09  'lib/angularfire.min.js',%0A    'http://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.8/angular-ui-router.min.js',%0A%09  'app.js',%0A    'app.route.js'
+        %7D
 ,%0A
-%09
   
-'app.signup_and_login.js',%0A%0A      'unit_tests/test_login.js'%09  %0A    %5D,%0A%09exclude: %5B%0A%09%5D,%0A%09preprocessors: %7B%0A    'app.js' : %5B'coverage'%5D,%0A%09%09 'app.signup_and_login.js' : %5B'coverage'%5D%0A%3E%3E%3E%3E%3E%3E%3E 52b51433d3f918c09bbb373d17303243aefbcf3e%0A%09%7D,%0A%09
+      
 repo
@@ -698,17 +698,24 @@
 rage'%5D,%0A
-%09
+        
 coverage
@@ -726,19 +726,28 @@
 rter: %7B%0A
-%09%09%09
+            
 type: 'h
@@ -752,19 +752,28 @@
 'html',%0A
-%09%09%09
+            
 dir: 'co
@@ -786,28 +786,51 @@
 /',%0A
-%09%09%09subdir: '.'%0A%09%7D,%0A%09
+            subdir: '.'%0A        %7D,%0A        
 port
@@ -837,17 +837,24 @@
 : 8080,%0A
-%09
+        
 colors: 
@@ -855,24 +855,28 @@
 lors: true,%0A
+    
     browsers
@@ -889,17 +889,24 @@
 rome'%5D,%0A
-%09
+        
 singleRu
@@ -910,24 +910,28 @@
 eRun: true,%0A
+    
     plugins:
@@ -929,24 +929,30 @@
  plugins: %5B%0A
+      
       'karma
@@ -973,15 +973,15 @@
 er',
+%0A
       
-%0A
     
@@ -1003,9 +1003,16 @@
 e',%0A
-%09
+        
     
@@ -1036,15 +1036,17 @@
     
-%5D
     
+%5D
 %0A%0A
+  
   %7D)

Delete dummy text