// Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 417 // jrioux : rename the japanese encodings
+#define LYX_FORMAT_LYX 418 // rgh: justification option
#define LYX_FORMAT_TEX2LYX 417
#if LYX_FORMAT_FOR_TEX2LYX != LYX_FORMAT_FOR_LYX