From 936ec661247e0997fbedbb9a6bab5ba7e19f2715 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20K=C3=BCmmel?= <kuemmel@lyx.org>
Date: Wed, 6 Jan 2016 12:55:12 +0100
Subject: [PATCH] fix merged build

---
 src/TextClass.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/TextClass.h b/src/TextClass.h
index 94fe003bd8..a6ffed902a 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -30,6 +30,10 @@
 #include <string>
 #include <vector>
 
+#ifdef ERROR
+#undef ERROR
+#endif
+
 namespace lyx {
 
 namespace support { class FileName; }
-- 
2.39.2