|  | @@ -79,15 +79,6 @@ define(['./workbox-5357ef54'], function (workbox) {
 | 
	
		
			
				|  |  |     * requests for URLs in the manifest.
 | 
	
		
			
				|  |  |     * See https://goo.gl/S9QRab
 | 
	
		
			
				|  |  |     */
 | 
	
		
			
				|  |  | -<<<<<<< HEAD
 | 
	
		
			
				|  |  | -  workbox.precacheAndRoute([{
 | 
	
		
			
				|  |  | -    "url": "registerSW.js",
 | 
	
		
			
				|  |  | -    "revision": "3ca0b8505b4bec776b69afdba2768812"
 | 
	
		
			
				|  |  | -  }, {
 | 
	
		
			
				|  |  | -    "url": "index.html",
 | 
	
		
			
				|  |  | -    "revision": "0.uk5org9dss"
 | 
	
		
			
				|  |  | -  }], {});
 | 
	
		
			
				|  |  | -=======
 | 
	
		
			
				|  |  |    workbox.precacheAndRoute(
 | 
	
		
			
				|  |  |      [
 | 
	
		
			
				|  |  |        {
 | 
	
	
		
			
				|  | @@ -101,7 +92,6 @@ define(['./workbox-5357ef54'], function (workbox) {
 | 
	
		
			
				|  |  |      ],
 | 
	
		
			
				|  |  |      {}
 | 
	
		
			
				|  |  |    );
 | 
	
		
			
				|  |  | ->>>>>>> startLogin
 | 
	
		
			
				|  |  |    workbox.cleanupOutdatedCaches();
 | 
	
		
			
				|  |  |    workbox.registerRoute(
 | 
	
		
			
				|  |  |      new workbox.NavigationRoute(workbox.createHandlerBoundToURL('index.html'), {
 |