[Lunar-commits] <moonbase> boinc-svn: added boinc to conflicts

[Duncan Gibson]

commit 55f405a87da4f1845341435bd046912a51e77279
Author: Christian Krause <kizkizzbangbang at googlemail.com>
Date:   Mon Apr 25 17:15:05 2011 +0200

    boinc-svn: added boinc to conflicts
---
 zbeta/boinc-svn/CONFLICTS |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/zbeta/boinc-svn/CONFLICTS b/zbeta/boinc-svn/CONFLICTS
new file mode 100644
index 0000000..2e672c2
--- /dev/null
+++ b/zbeta/boinc-svn/CONFLICTS
@@ -0,0 +1 @@
+conflicts boinc