diff options
Diffstat (limited to 'profiling/org.eclipse.linuxtools.dataviewers/build.properties')
| -rw-r--r-- | profiling/org.eclipse.linuxtools.dataviewers/build.properties | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/profiling/org.eclipse.linuxtools.dataviewers/build.properties b/profiling/org.eclipse.linuxtools.dataviewers/build.properties index fcb28d6c85..952295e941 100644 --- a/profiling/org.eclipse.linuxtools.dataviewers/build.properties +++ b/profiling/org.eclipse.linuxtools.dataviewers/build.properties @@ -1,23 +1,4 @@ -<<<<<<< .working source.. = src/ output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - icons/,\ - plugin.properties,\ - doc/ -src.includes = META-INF/,\ - doc/,\ - icons/,\ - plugin.properties,\ - src/ -======= -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - icons/,\ - about.html,\ - plugin.properties ->>>>>>> .merge-right.r1063 +src.includes = doc/,\ + icons/
\ No newline at end of file |