Fix merge conflicts

2019-11-20 18:56:18 +01:00
parent dd96432c6e bd301bd5cc
commit c0828c7f1d
17 changed files with 197 additions and 85 deletions
@@ -1,5 +1,5 @@
 [Main]
-timestamp = 2019-11-09 14:38:32
+timestamp = 2019-11-19 21:49:29
 theme = default
 syntax = default_light
 guidark = False
@@ -36,6 +36,7 @@ spelltool = internal
 spellcheck = en
 showtabsnspaces = False
 showlineendings = False
+bigdoclimit = 800

 [Backup]
 backuppath =