[wtf] Merge open155 > github/master

open #155 open #186 WTF yet again getting merge conflicts when remerging open155;
2015-10-30 16:24:20 -07:00
parent 1e6731e6f2 bc82a5bf7e
commit 485e6a9de1
1 changed files with 4 additions and 4 deletions
--- a/platform/commonUI/general/res/sass/user-environ/_layout.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss
@@ -43,9 +43,9 @@
    position: absolute;
 }

-.editor {
-	@include border-radius($basicCr * 1.5);
-}
+//.editor {
+//	@include border-radius($basicCr * 1.5);
+//}

 .contents {
    $myM: 0; //$interiorMargin;