merged

2019-02-12 18:59:21 +01:00
parent 4631fa7ec2 4e906261be
commit 8ca65fed00
4 changed files with 86 additions and 38 deletions
@@ -5,7 +5,10 @@ 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')