use local.conf instead of sample.local.conf

ui/logviewer.html

@@ -59,11 +59,7 @@
     <script src="vendor/angular/angular-resource.js"></script>
     <script src="vendor/ui-bootstrap-tpls-0.4.0.js"></script>
     <script src="vendor/angular/angular-sanitize.min.js"></script>
-<<<<<<< HEAD
     <script src="js/config/local.conf.js"></script>
-=======
-    <script src="js/config/sample.local.conf.js"></script>
->>>>>>> directive to markup log in resources
     <script src="js/app.js"></script>
     <script src="js/services.js"></script>
     <script src="js/providers.js"></script>