After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 619655 - Diff conflict markers
Diff conflict markers
Status: RESOLVED FIXED
Product: gtk+
Classification: Platform
Component: Widget: Other
2.90.x
Other Linux
: Normal trivial
: ---
Assigned To: gtk-bugs
gtk-bugs
Depends on:
Blocks:
 
 
Reported: 2010-05-25 19:30 UTC by Bruce Cowan
Modified: 2010-05-25 22:34 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
Removes conflict markers (1.57 KB, patch)
2010-05-25 19:30 UTC, Bruce Cowan 		committed Details | Review

Description Bruce Cowan 2010-05-25 19:30:07 UTC 
Created attachment 161973 [details] [review]
Removes conflict markers

There are some conflict markers around from the native-layout-incubator merge.
Comment 1 Javier Jardón (IRC: jjardon) 2010-05-25 19:48:09 UTC 
Comment on attachment 161973 [details] [review]
Removes conflict markers

commit a538f639b69a39d7bb85b39af2dfd296d28fc0aa
Comment 2 Javier Jardón (IRC: jjardon) 2010-05-25 19:49:21 UTC 
This problem has been fixed in the development version. The fix will be available in the next major software release.

Thanks Bruce.
Comment 3 Bruce Cowan 2010-05-25 22:34:52 UTC 
No problem