diff -r c7c26511138f -r 7c4a911dc066 buildframework/helium/tools/quality/conflict-checker.ant.xml
--- a/buildframework/helium/tools/quality/conflict-checker.ant.xml Wed Jun 16 16:51:40 2010 +0300
+++ b/buildframework/helium/tools/quality/conflict-checker.ant.xml Fri Aug 13 14:59:05 2010 +0300
@@ -31,6 +31,16 @@
@scope private
-->
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
-
+
@@ -82,7 +80,7 @@
-
+
macro: ${helium.dir}/tools/common/templates/macro