| commit | 6db31b6c3acaf73feb790656422d6fb4e93b89ed | [log] [tgz] |
|---|---|---|
| author | Eike Stepper <stepper@esc-net.de> | Sat Apr 20 08:28:07 2013 +0200 |
| committer | Eike Stepper <stepper@esc-net.de> | Sat Apr 20 08:28:07 2013 +0200 |
| tree | 5127e35cf8b48d23b861ebce8322a7d0408e2656 | |
| parent | 38ddb33c40630f799efa9fb3af1d1a3754e9201f [diff] |
Fix merge markers
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.properties b/plugins/org.eclipse.emf.cdo.ui/plugin.properties index 5f2e30d..3873d2a 100644 --- a/plugins/org.eclipse.emf.cdo.ui/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.ui/plugin.properties Binary files differ