diff options
Diffstat (limited to 'infrastructure/msvc/getversion.pl')
| -rw-r--r-- | infrastructure/msvc/getversion.pl | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/infrastructure/msvc/getversion.pl b/infrastructure/msvc/getversion.pl index 42ae4b63..0cf9cbcb 100644 --- a/infrastructure/msvc/getversion.pl +++ b/infrastructure/msvc/getversion.pl @@ -11,13 +11,6 @@ chdir $basedir or die "$basedir: $!"; require "$basedir\\infrastructure\\BoxPlatform.pm.in"; -<<<<<<< HEAD -open VERSIONFILE, "> $basedir/lib/common/BoxVersion.h" - or die "BoxVersion.h: $!"; -print VERSIONFILE "#define BOX_VERSION \"$BoxPlatform::product_version\"\n"; -close VERSIONFILE; - -======= my $verfile = "$basedir/lib/common/BoxVersion.h"; my $newver = "#define BOX_VERSION \"$BoxPlatform::product_version\"\n"; my $oldver = ""; @@ -38,5 +31,4 @@ if ($newver ne $oldver) } print $BoxPlatform::product_version; ->>>>>>> 0.12 exit 0; |