fixed conflict

2017-06-26 16:35:24 +06:30
parent 20afabd86d fcd1590868
commit 04e44c4859
2 changed files with 6 additions and 0 deletions
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -148,6 +148,10 @@
 	background-color:#7a62d3;
 }

+.orange{
+	 background-color:#FF7F50;
+}
+
 .red {
 	background-color:#ff0000;
 }