Please sign in to comment.
Merge branch 'MDL-39278-master' of git://github.com/damyon/moodle
Conflicts: theme/bootstrap/style/generated.css theme/bootstrap/style/moodle.css theme/bootstrapbase/less/moodle/recess.txt theme/bootstrapbase/style/generated.css
- Loading branch information...
Showing with 8 additions and 21 deletions.
|@@ -1,5 +0,0 @@|
|-Analyzing the following files: style/generated.css|
|-Error reading file: style/generated.css|
|@@ -1,3 +1,3 @@|
|-The generated.css file is created from .less files via the method described in the readme|
|-in the /less/ folder. It's unwise to directly the edit the generated.css as your changes|
|+These css files are created from .less files via the method described in the readme|
|+in the /theme/bootstrap/less/ folder. It's unwise to directly the edit the css files as your changes|
|may be overwritten.|