Merge branch 'playeronside' of https://bitbucket.org/sco44/tecnologiabanana into playeronside

2018-12-15 00:26:28 +01:00
parent 121a34f007 d34f049d7f
commit b93e9d931c
4 changed files with 39 additions and 26 deletions
@@ -9,7 +9,12 @@ 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) {