Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortjung2012-04-22 16:02:29 -0400
committertjung2012-04-22 16:02:29 -0400
commit23c680ff9c5567d0f8ed1237ab3ed7b03471f07f (patch)
tree34dcbaa456edebb16c1575e497ea161ac1b4d5b1 /features
parentaae84264e45e5da09665bf0090d46e9ff6eafa27 (diff)
downloadorg.eclipse.etrice-23c680ff9c5567d0f8ed1237ab3ed7b03471f07f.tar.gz
org.eclipse.etrice-23c680ff9c5567d0f8ed1237ab3ed7b03471f07f.tar.xz
org.eclipse.etrice-23c680ff9c5567d0f8ed1237ab3ed7b03471f07f.zip
[generator.c] send and receive handler implemented first step
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.etrice.feature/feature.xml8
1 files changed, 2 insertions, 6 deletions
diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index 0c03a2a69..d0bc0c8b3 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -195,8 +195,7 @@ http://www.eclipse.org/legal/epl-v10.html
fragment="true"
unpack="false"/>
- <plugin
-<<<<<<< HEAD
+ <plugin
id="org.eclipse.etrice.generator.c"
download-size="0"
install-size="0"
@@ -204,10 +203,7 @@ http://www.eclipse.org/legal/epl-v10.html
unpack="false"/>
<plugin
- id="org.eclipse.etrice.generator.launch.c"
-=======
- id="org.eclipse.etrice.etunit.converter"
->>>>>>> 21ce8b7a3b5c5996810a8e7b914ee2b97a2f0803
+ id="org.eclipse.etrice.generator.launch.c"
download-size="0"
install-size="0"
version="0.0.0"

Back to the top