resolve merge conflicts

2017-09-19 14:24:26 +02:00
parent f127240a2f 6683434c62
commit d2b27f3588
17 changed files with 1387 additions and 537 deletions
--- a/customize.dist/src/less2/main.less
+++ b/customize.dist/src/less2/main.less
@@ -28,4 +28,5 @@ body.cp-app-slide { @import "../../../slide/app-slide.less"; }
 body.cp-app-file { @import "../../../file/app-file.less"; }
 body.cp-app-filepicker { @import "../../../filepicker/app-filepicker.less"; }
 body.cp-app-poll { @import "../../../poll/app-poll.less"; }
+body.cp-app-whiteboard { @import "../../../whiteboard/app-whiteboard.less"; }