Fixed wrongly merged TimeAxis.js

dist/vis.css

@@ -320,8 +320,7 @@
 
 .vis.timeline .timeaxis .grid.vertical {
   position: absolute;
-  width: 0;
-  border-right: 1px solid;
+  border-left: 1px solid;
 }
 
 .vis.timeline .timeaxis .grid.minor {

lib/timeline/component/TimeAxis.js

@@ -239,11 +239,9 @@ TimeAxis.prototype._repaintLabels = function () {
         }
         this._repaintMajorText(x, step.getLabelMajor(), orientation, className);
       }
-      if (this.options.showMajorLines == true) {
-        prevLine = this._repaintMajorLine(x, orientation, className);
-      }
+      prevLine = this._repaintMajorLine(x, orientation, className);
     }
-    else if (this.options.showMinorLines == true) {
+    else {
       prevLine = this._repaintMinorLine(x, orientation, className);
     }