From 407a6c18ccc7c8cad47c5286f61c90c0587a9c76 Mon Sep 17 00:00:00 2001
From: matteo <matteoscorzafava@gmail.com>
Date: Tue, 12 Feb 2019 18:59:33 +0100
Subject: [PATCH] merged1

---
 src/index.js                           |  4 ----
 src/reccomenders/popGlobaleAssoluta.js | 16 ----------------
 2 files changed, 20 deletions(-)

diff --git a/src/index.js b/src/index.js
index 13a257d..caf9c23 100644
--- a/src/index.js
+++ b/src/index.js
@@ -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')
 
diff --git a/src/reccomenders/popGlobaleAssoluta.js b/src/reccomenders/popGlobaleAssoluta.js
index 87d9c06..cc9b921 100644
--- a/src/reccomenders/popGlobaleAssoluta.js
+++ b/src/reccomenders/popGlobaleAssoluta.js
@@ -24,7 +24,6 @@ class popGlobaleAssoluta extends React.Component {
 
 
         // let listSiti = ['1828', '1829', '1838', '1839', '1846', '1822', '1847', '1831', '1827', '1848', '1824', '1830', '1836', '1850', '1849', '1851', '1861', '1823', '1863', '1834', '1904', '1906', '1901', '1862', '1859'];
-<<<<<<< HEAD
         let listSiti = ['1828', '1838', '1839', '1846', '1847', '1831', '1827',  '1849',  '1823', '1863', '1834', '1901',  '1859'];
         let axiosReq = [];
         for(let i=0; i<listSiti.length; i++){
@@ -41,21 +40,6 @@ class popGlobaleAssoluta extends React.Component {
         })
         )
         }
-=======
-        let listSiti = ['1828', '1838', '1839', '1846', '1847', '1831', '1827', '1849', '1823', '1863', '1834', '1901', '1859'];
-        axios.all(listSiti.map(sito => {
-            axios.get(`http://site${sito}.tw.cs.unibo.it/globpop`, {
-                'params': {
-                    'id': this.props.match.params.id
-                }
-            })
-        })).then( res=>{console.log(listSiti)
-            console.log(res.data)}
-         
-
-            )
-    }
->>>>>>> 4e906261be5bde911e46316a11ba0ec25de00fe8
 
     // METODI
     getThumbnailsNames(reccomended) {