che palle

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) {