fix merge conflicts

2017-09-21 10:50:15 +02:00
parent 3919b7130b ed9e0e2054
commit 9ee9a20152
131 changed files with 13064 additions and 6461 deletions
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 255
+106 90 115
+0 0 0
+213 230 255
+189 205 238
+238 238 255
+106 172 197
+90 139 180
+123 197 205
+0 0 0
+0 0 0
+123 197 255
+0 0 139
+255 131 131
+164 0 0