FIX Merge code conflict

public/react/src/forge/Index.js

@@ -74,14 +74,7 @@ class Index extends Component{
           render={
             (props) => (<ProjectIndex {...this.props} {...props} {...this.state} current_user={current_user}/>)
           }
-<<<<<<< HEAD
         ></Route>
-=======
-        ></Route>
-
-
-
->>>>>>> 07e257798976a985e99678db864e9ed96ad5dfdf
       </Switch>
     )
 

public/react/src/forge/Main/list.css

@@ -446,7 +446,6 @@ body,#root{
     width: 100%;
   }
 }
-<<<<<<< HEAD
 .null_data_box{
   width: 100%;
   border: 1px solid #d4d4d5;
@@ -489,7 +488,5 @@ body,#root{
 .item .gitAddressClone input:focus{
 border:  1px solid #2185d0;
 }
-=======
 .content-file{margin-top: 8px;}
 .text-center{text-align: center;}
->>>>>>> 07e257798976a985e99678db864e9ed96ad5dfdf