Fixed merge conflicts

This commit is contained in:
Veronica K. B. Olsen
2019-05-18 22:14:30 +02:00
12 changed files with 203 additions and 39 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="0.1.3" fileVersion="1.0" timeStamp="2019-05-18 21:40:50">
<novelWriterXML appVersion="0.1.3" fileVersion="1.0" timeStamp="2019-05-18 20:51:40">
<project>
<name>Sample Project</name>
<title>Sample Project</title>