X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FStem%2FEvent%2FSignal.pm;fp=lib%2FStem%2FEvent%2FSignal.pm;h=7d8b41fc214fa6b09b7bbb0f88e105341b59f50d;hb=907cbc6d770ea6bf36c1649d1952caaccf17d420;hp=65231038bd4957423ec576401cf99b777c2e29cb;hpb=edf7663cc9a0a4654ba0dd48662c280a9a4dba4f;p=urisagit%2FStem.git

diff --git a/lib/Stem/Event/Signal.pm b/lib/Stem/Event/Signal.pm
index 6523103..7d8b41f 100644
--- a/lib/Stem/Event/Signal.pm
+++ b/lib/Stem/Event/Signal.pm
@@ -32,14 +32,7 @@ sub _build {
 
 	$SIG{ $signal } = $cached_handlers{$signal} ||=
 		sub {
-<<<<<<< HEAD:lib/Stem/Event/Signal.pm
-	Stem::Event::Queue::queue_has_event() ;
-			
-#print "HIT $signal\n";
-=======
-print "HIT $signal\n";
-			Stem::Event::Queue::mark_not_empty() ;
->>>>>>> master:lib/Stem/Event/Signal.pm
+			Stem::Event::Queue::queue_has_event() ;
 			push @signal_queue, $signal
 		} ;