merged1

2019-02-12 18:59:33 +01:00
parent 8ca65fed00
commit 407a6c18cc
2 changed files with 0 additions and 20 deletions
@@ -5,10 +5,6 @@ import ReactDOM from 'react-dom';
 import App from './App';
 import registerServiceWorker from './registerServiceWorker';
 import { HashRouter, BrowserRouter } from 'react-router-dom'; // eslint-disable-line 
-<<<<<<< HEAD
-
-=======
->>>>>>> 4e906261be5bde911e46316a11ba0ec25de00fe8
 localStorage['lastWatched'] ? function (){}() : localStorage.setItem('lastWatched', JSON.stringify([]))
 localStorage['lastId'] ? function (){}() : localStorage.setItem('lastId','0J2QdDbelmY')