[458147] Apply three-way merging also for rejecting attribute changes27/42927/2
[EMFCompare2.git] / plugins / org.eclipse.emf.compare.uml2.edit / 
tree6ed4cfab19b6eb221f23866766132c41d2103c8e
drwxr-xr-x   ..
-rw-r--r-- 659 .checkstyle
-rw-r--r-- 412 .classpath
-rw-r--r-- 1036 .project
drwxr-xr-x - .settings
drwxr-xr-x - META-INF
-rw-r--r-- 9079 about.html
-rw-r--r-- 619 build.properties
drwxr-xr-x - icons
-rw-r--r-- 11059 plugin.properties
-rw-r--r-- 3501 plugin.xml
-rw-r--r-- 725 pom.xml
drwxr-xr-x - src-gen
drwxr-xr-x - src