// Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 538 // uwestoehr: support for formula indentation
-#define LYX_FORMAT_TEX2LYX 538
+#define LYX_FORMAT_LYX 602 // spitz: semantic branch colors
+#define LYX_FORMAT_TEX2LYX 602
#if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
#ifndef _MSC_VER