conflict

61d8d94f · Trần Văn Minh · fb53bc79 · 737e4c9e · 61d8d94f
Commit 61d8d94f authored Feb 28, 2020 by Trần Văn Minh
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

override-be.css assets/backend/css/override-be.css +1 -2

No files found.
--- a/assets/backend/css/override-be.css
+++ b/assets/backend/css/override-be.css
@@ -9,4 +9,4 @@ div.topnav-navbar-dark {
 } */
 img.card-img-top {
    height: 193px;
 }
\ No newline at end of file