remove stray conflict marker

2025-07-23 10:01:35 +00:00 · 2002-05-12 15:21:57 +00:00
parent b94beb3289
commit 973662d5c3
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@ -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