[FIX] Last Commit Issues

Author: FMCalisto

.DS_Store

@@ -11,11 +11,7 @@
 
   <!-- ========================= CSS here ========================= -->
   <link rel="stylesheet" href="assets/css/bootstrap.min.css" />
-<<<<<<< HEAD
   <link rel="stylesheet" href="assets/css/icons.css" />
-=======
-  <link rel="stylesheet" href="assets/css/LineIcons.2.0.css" />
->>>>>>> 71c27ff ([NEW] Landing Page)
   <link rel="stylesheet" href="assets/css/animate.css" />
   <link rel="stylesheet" href="assets/css/tiny-slider.css" />
   <link rel="stylesheet" href="assets/css/glightbox.min.css" />