merging

[urisagit/Stem.git] / lib / Stem / Event / Signal.pm

diff --git a/lib/Stem/Event/Signal.pm b/lib/Stem/Event/Signal.pm
index 95e1023..6523103 100644 (file)
--- a/lib/Stem/Event/Signal.pm
+++ b/lib/Stem/Event/Signal.pm
@@ -32,9 +32,14 @@ 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
                        push @signal_queue, $signal
                } ;