Merge branch 'master' of https://gitlab.del.ac.id/if415009/dtrs

# Conflicts: # resources/views/vendor/adminlte/layouts/app.blade.php

Merge branch 'master' of https://gitlab.del.ac.id/if415009/dtrs
76e3b64b · Eko Simanjuntak · aad7490d · a175e6e8 · 76e3b64b
Commit 76e3b64b authored Mar 15, 2017 by Eko Simanjuntak
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app.blade.php resources/views/vendor/adminlte/layouts/app.blade.php +1 -1

No files found.
--- a/resources/views/vendor/adminlte/layouts/app.blade.php
+++ b/resources/views/vendor/adminlte/layouts/app.blade.php
@@ -29,7 +29,7 @@ desired effect
 |               | sidebar-mini                            |
 |---------------------------------------------------------|
 -->
-<baco>
+
 <body class="skin-blue sidebar-mini">
 <div id="app">
    <div class="wrapper">