Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-09-20 03:40:54 -0400
committerHenrik Rentz-Reichert2012-09-20 03:40:54 -0400
commit08b86f1f3a8238a7d07188d8d60d8bcdef55a601 (patch)
treee76ec2a07b29669718aa94c19dc93b4b373cdfa2 /plugins/org.eclipse.etrice.logging
parentacac9bddd638319d2673d7b14c0c9579e792174d (diff)
downloadorg.eclipse.etrice-08b86f1f3a8238a7d07188d8d60d8bcdef55a601.tar.gz
org.eclipse.etrice-08b86f1f3a8238a7d07188d8d60d8bcdef55a601.tar.xz
org.eclipse.etrice-08b86f1f3a8238a7d07188d8d60d8bcdef55a601.zip
[logging] removed conflict markers
Diffstat (limited to 'plugins/org.eclipse.etrice.logging')
-rw-r--r--plugins/org.eclipse.etrice.logging/.gitignore6
1 files changed, 0 insertions, 6 deletions
diff --git a/plugins/org.eclipse.etrice.logging/.gitignore b/plugins/org.eclipse.etrice.logging/.gitignore
index 84d383f25..092357e47 100644
--- a/plugins/org.eclipse.etrice.logging/.gitignore
+++ b/plugins/org.eclipse.etrice.logging/.gitignore
@@ -1,7 +1 @@
bin
-<<<<<<< HEAD
-
-
-
-=======
->>>>>>> refs/heads/state_machine_inheritance

Back to the top