landingD css fix

Author: goodgoof

client/components/LandingD/LandingD.scss

@@ -62,11 +62,7 @@ img.project1 {
   color: #212121;
 }
 
-<<<<<<< HEAD
 .column{
-=======
-.column1, .column2, .column3 {
->>>>>>> 7fcea305a1e111cc6d48d4b6e341182eb4eac9cc
     margin-top: 103px;
     width: 360px;
     height:477px;