diff options
author | Laurent Delaigue | 2016-05-17 06:25:12 +0000 |
---|---|---|
committer | Laurent Delaigue | 2016-05-30 08:42:38 +0000 |
commit | ba05fbe16ff981d81606211525810ed4c8b32648 (patch) | |
tree | b3d541c7dd75d071e0de6d5ec55557ee40890676 /plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF | |
parent | ecb72749dfc9b273b736655cea3a3c4b1629f87d (diff) | |
download | org.eclipse.emf.compare-ba05fbe16ff981d81606211525810ed4c8b32648.tar.gz org.eclipse.emf.compare-ba05fbe16ff981d81606211525810ed4c8b32648.tar.xz org.eclipse.emf.compare-ba05fbe16ff981d81606211525810ed4c8b32648.zip |
Fix wrong conflict detections
Change-Id: I7fb71c5412cf6fb6ae89ac2148882888c1692fa5
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF')
0 files changed, 0 insertions, 0 deletions