From e49a8463b8369f43660bfad133ab8b58736e6cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@dhbw.de>
Date: Fri, 2 Jan 2015 16:13:03 +0100
Subject: [PATCH] merge conlict in bin/.gitignore behoben

---
 bin/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/.gitignore b/bin/.gitignore
index 1431cd5f..fb7b1f33 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -2,3 +2,4 @@
 /de/
 /plugindevelopment/
 /syntaxTree/
+/mycompiler/