directive to markup log in resources

ui/js/controllers/logviewer.js

@@ -13,8 +13,6 @@ treeherder.controller('LogviewerCtrl',
         }
 
 
-        $scope.displayedStep;
-
         $scope.scrollTo = function(step, linenumber) {
             $location.hash('lv-line-'+linenumber);
             $anchorScroll();
@@ -43,6 +41,11 @@ treeherder.controller('LogviewerCtrl',
             // @@@ we should display some kind of "loading" indicator in the
             // logs area in case the log is really large
             $scope.log_text = $scope.full_log[step.order];
+
+            //so that all displayed steps are auto scrolled to top
+            $timeout(function() {
+                document.getElementById("lv-log-container").scrollTop = 0;
+            });
         };
 
         $scope.init = function() {

ui/logviewer.html

@@ -59,7 +59,11 @@
     <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>