Merge master.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 708e48910977ceb7c68017281e735b5293bb4eb9..8027ea88c086f8d93a6501737a8ce8fddedb3934 100644 (file)
--- 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')