// Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 570 // spitz: biblatex bibencodings
-#define LYX_FORMAT_TEX2LYX 570
+#define LYX_FORMAT_LYX 615 // spitz: acknowledgement > acknowledgment
+#define LYX_FORMAT_TEX2LYX 615
#if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
#ifndef _MSC_VER