isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-07-28 04:29:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove stray conflict marker

Browse Source
This commit is contained in:
Havoc Pennington
2002-05-12 15:21:57 +00:00
parent b94beb3289
commit 973662d5c3
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -71,7 +71,6 @@
the calc_showing, don't focus it, it's probably on another the calc_showing, don't focus it, it's probably on another
workspace or something. workspace or something.
>>>>>>> 1.239
2002-05-09 Havoc Pennington <hp@redhat.com> 2002-05-09 Havoc Pennington <hp@redhat.com>
* src/frames.c (show_tip_now): DefaultScreen() returns the screen * src/frames.c (show_tip_now): DefaultScreen() returns the screen