FIX Merge code conflict

public/react/src/forge/Index.js

@@ -55,9 +55,9 @@ class Index extends Component{
       console.log(error)
     })
   }
-  
+
   render(){
-    const { current_user } = this.state; 
+    const { current_user } = this.state;
     return(
       <Switch {...this.props}>
         <Route path="/projects/:projectsType/new"
@@ -70,21 +70,14 @@ class Index extends Component{
             (props) => (<ProjectDetail {...this.props} {...props} {...this.state} current_user={current_user}/>)
           }
         ></Route>
-        <Route exact path="/projects" 
+        <Route exact path="/projects"
           render={
             (props) => (<ProjectIndex {...this.props} {...props} {...this.state} current_user={current_user}/>)
           }
-<<<<<<< HEAD
-        ></Route> 
-=======
         ></Route>
-
-
-
->>>>>>> 07e257798976a985e99678db864e9ed96ad5dfdf
       </Switch>
     )
-  
+
   }
 }
 export default CNotificationHOC() ( SnackbarHOC() ( Index ));

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

@@ -70,7 +70,7 @@ body,#root{
   justify-content: space-between;
   flex-wrap: wrap;
   align-items: center;
-  padding:15px 0px 25px; 
+  padding:15px 0px 25px;
 }
 .list-r-Search{
   width: 400px;
@@ -211,7 +211,7 @@ body,#root{
   color: #999;
 }
 .headerMenu-wrapper li{
-  padding:6px 14px; 
+  padding:6px 14px;
   position: relative;
   text-align: center
 }
@@ -324,7 +324,7 @@ body,#root{
   padding:0px 6px;
   background-color:#fff;
   color:#666!important;
-  display: inline-block; 
+  display: inline-block;
 }
 .messages{
   max-width: 700px;
@@ -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