?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 1787ca2) | patch
Remove a forgotten merge marker
commitd7a82f81e3d6d2a51a89a015cd9dea8137d8db1e
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Fri, 16 Apr 2010 22:30:39 +0000 (17 00:30 +0200)
committerRobin Rosenberg <robin.rosenberg@dewire.com>
Fri, 16 Apr 2010 22:30:39 +0000 (17 00:30 +0200)
tree4ca0bc2a8dc4cb9da1af61262500f05c6544bee4tree | snapshot (tar.gz zip)
parent1787ca23b9ff80a66e86d22fbc302726057001f5commit | diff
Remove a forgotten merge marker

Change-Id: Iba9e89fd523fab922d51eddf17855547ea94d260
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties diff | blob | blame | history
Eclipse Git Team Provider