Merge pull request #433 from edudepetris/fix-merge-375

Remove conflicts on merge #375

production/form.html

@@ -7,15 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-	
     <title>Gentelella Alela! | </title>
-<<<<<<< HEAD
-=======
-
-
-    <title>Gentelella Alela! | </title>
-
->>>>>>> refs/remotes/puikinsh/Development
 
     <!-- Bootstrap -->
     <link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
@@ -161,7 +153,7 @@
                         <li><a href="#level1_2">Level One</a>
                         </li>
                     </ul>
-                  </li>                  
+                  </li>
                   <li><a href="javascript:void(0)"><i class="fa fa-laptop"></i> Landing Page <span class="label label-success pull-right">Coming Soon</span></a></li>
                 </ul>
               </div>
@@ -1075,7 +1067,7 @@
                   <div id="editor-one" class="editor-wrapper"></div>
 
                   <textarea name="descr" id="descr" style="display:none;"></textarea>
-                  
+
                   <br />
 
                   <div class="ln_solid"></div>
@@ -1370,6 +1362,6 @@
     <script src="../vendors/starrr/dist/starrr.js"></script>
     <!-- Custom Theme Scripts -->
     <script src="../build/js/custom.min.js"></script>
-	
+
   </body>
 </html>