// Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 425 // uwestoehrx: support for the package cancel
-#define LYX_FORMAT_TEX2LYX 425 // jrioux : \cite_engine_type (authoryear|numerical)
+#define LYX_FORMAT_LYX 425 // uwestoehr: support for the package cancel
+#define LYX_FORMAT_TEX2LYX 425 // uwestoehr: support for the package cancel
#if LYX_FORMAT_FOR_TEX2LYX != LYX_FORMAT_FOR_LYX
#warning "tex2lyx produces an out of date file format."