Skip to content

U
ulakbus-ui
Commit efc045d9 authored by Erkan Öğümsöğütlü's avatar Erkan Öğümsöğütlü
Browse files
Options

Conflict fix 

Fixed
parents a8bf5d0e e0579fc6
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 35 deletions
app/components/dashboard/dashboard.html
View file @ efc045d9
<div ng-app="ulakbus.dashboard">
<div class="starter-template">
<!-- table view -->
<table class="table table-bordered" style="background-color:#fff;">
<thead>
......@@ -102,19 +103,5 @@
<hr>
</div>
</div>
\ No newline at end of file
app/index.html
View file @ efc045d9
......@@ -28,7 +28,6 @@
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
......
index.html
View file @ efc045d9
......@@ -33,7 +33,6 @@
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment