From 6dab943dd2e9b91a945733b4d29954f8f1021154 Mon Sep 17 00:00:00 2001
From: Egon Willighagen <egonw@users.sourceforge.net>
Date: Mon, 23 Nov 2009 13:46:04 +0100
Subject: [PATCH] Added some extra lines, hopefully fixing the conflicts all
 the time

---
 build.props | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.props b/build.props
index 3efe3dda0a2..61691f7fc99 100644
--- a/build.props
+++ b/build.props
@@ -1 +1,3 @@
+# configuration file
+#
 version=1.3.0.git