X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fversion.h;h=0a3b4930085ff5bffbd4fe0cc78b5a76949e31d2;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=0871b0a01eb07e27732b812187894ea545265f0d;hpb=cc6c86ff3b7d10bc6a0ea286020f63a75fef9608;p=lyx.git

diff --git a/src/version.h b/src/version.h
index 0871b0a01e..0a3b493008 100644
--- a/src/version.h
+++ b/src/version.h
@@ -32,8 +32,8 @@ extern char const * const lyx_version_info;
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 502 // uwestoehr: new environment "solution" in theorems
-#define LYX_FORMAT_TEX2LYX 502
+#define LYX_FORMAT_LYX 511 // rgh: inverted branches
+#define LYX_FORMAT_TEX2LYX 511
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER