news height fix

kluwena · kluwena · commit 0d63df9a35a7 · 2017-08-06T09:54:51.000-07:00
diff --git a/client/src/components/News.js b/client/src/components/News.js
@@ -77,11 +77,7 @@ class News extends Component {
     const { news, tweets } = this.props;
     const divStyle= {
       overflow: 'auto',
-<<<<<<< HEAD
-      height: '100vh',
-=======
       height: '80vh'
->>>>>>> news feed height fix
     };
     return (
       <div>
