Disable the Resolve Conflicts and Conflicts Resolved actionsmaster
treece8bd52cd000514097476a01ae08d9e4468a731f
-rw-r--r-- 26 .gitignore
-rw-r--r-- 174 CONTRIBUTORS
-rw-r--r-- 36571 LICENSE
-rw-r--r-- 69 README
-rw-r--r-- 2158 README.markdown
-rw-r--r-- 825 build.xml
drwxr-xr-x - javahelp
-rw-r--r-- 260 manifest.mf
drwxr-xr-x - misc
drwxr-xr-x - nbproject
drwxr-xr-x - release
drwxr-xr-x - src