remove conflict data

2018-07-10 18:13:41 +06:30
parent bf0f76ebc7 441f37ba8a
commit 47b59cca59
23 changed files with 850 additions and 33 deletions
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -103,4 +103,8 @@ i.logout_icon{
 /* Second display image */
 .second-display{
  margin : 12px;
+}
+
+.float_right{
+  float : right;
 }