From 3c480c32dd1472c866b7460c785379ed5e9ffb8b Mon Sep 17 00:00:00 2001
From: matteo <matteoscorzafava@gmail.com>
Date: Sat, 15 Dec 2018 00:27:44 +0100
Subject: [PATCH] che palle

---
 src/App.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/App.js b/src/App.js
index 5e8585b..ad4536c 100644
--- a/src/App.js
+++ b/src/App.js
@@ -9,12 +9,6 @@ import VideoList from './VideoList';
 import Suggestion from './areainfo/Suggestion';
 import { ReactHeight } from 'react-height';
 import './css/App.css';
-<<<<<<< HEAD
-
-=======
-import Related from './reccomenders/Related';
-import Random from './reccomenders/Random';
->>>>>>> d34f049d7f8903074356e8a32a57c34891df385e
 
 class App extends React.Component {
 	constructor(props) {