X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=wscript;h=8027ea88c086f8d93a6501737a8ce8fddedb3934;hp=708e48910977ceb7c68017281e735b5293bb4eb9;hb=a79d78d8bb6d51f6662f1f63b9f8fd19e1a0c5f1;hpb=1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33

diff --git a/wscript b/wscript
index 708e48910..8027ea88c 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,11 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
+<<<<<<< HEAD
 VERSION = '2.0.0devel'
+=======
+VERSION = '1.64.18devel'
+>>>>>>> master
 
 def options(opt):
     opt.load('compiler_cxx')