diff options
Diffstat (limited to 'plugins/org.eclipse.etrice.logging/.gitignore')
| -rw-r--r-- | plugins/org.eclipse.etrice.logging/.gitignore | 6 |
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 |