diff options
| author | Havoc Pennington <hp@src.gnome.org> | 2002-05-12 15:21:57 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2002-05-12 15:21:57 +0000 |
| commit | 973662d5c374d2441b4aedbd9804cb9a8d7d9747 (patch) | |
| tree | e4d3bdd8eddc4f0ddb3c4cbf903e370ab01cec63 | |
| parent | b94beb32891f6be3c6ec4490f5e5f8af470fc23f (diff) | |
| download | metacity-973662d5c374d2441b4aedbd9804cb9a8d7d9747.tar.gz | |
remove stray conflict marker
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -71,7 +71,6 @@ the calc_showing, don't focus it, it's probably on another workspace or something. ->>>>>>> 1.239 2002-05-09 Havoc Pennington <hp@redhat.com> * src/frames.c (show_tip_now): DefaultScreen() returns the screen |