Conflict fix

Fixed

Conflict fix
Fixed
efc045d9 · Erkan Öğümsöğütlü · a8bf5d0e · e0579fc6 · efc045d9 · efc045d9
Commit efc045d9 authored Sep 02, 2015 by Erkan Öğümsöğütlü
Show whitespace changes
Inline Side-by-side

Showing with 20 additions and 35 deletions

app.css app/app.css +2 -2

dashboard.html app/components/dashboard/dashboard.html +2 -15

index.html app/index.html +16 -17

index.html index.html +0 -1

No files found.
--- a/app/app.css
+++ b/app/app.css
--- a/app/components/dashboard/dashboard.html
+++ b/app/components/dashboard/dashboard.html
 <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
--- a/app/index.html
+++ b/app/index.html
@@ -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>

--- a/index.html
+++ b/index.html
@@ -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>