X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FStem%2FEvent%2FQueue.pm;h=c4732379a629b32b9babfbb3c27b30d25b9b456a;hb=d88e43718237ee11b2a4458ed280dccfe6aea2d7;hp=53db4fa99767ccab423a35b3d7eb5b82b52ac286;hpb=4932dd97955faf49e7777420bb2fb196db7cb92a;p=urisagit%2FStem.git

diff --git a/lib/Stem/Event/Queue.pm b/lib/Stem/Event/Queue.pm
index 53db4fa..c473237 100644
--- a/lib/Stem/Event/Queue.pm
+++ b/lib/Stem/Event/Queue.pm
@@ -41,6 +41,7 @@
 
 
 package Stem::Event::Queue ;
+our @ISA = qw( Stem::Event ) ;
 
 use strict ;
 use warnings ;
@@ -48,7 +49,12 @@ use warnings ;
 use Socket;
 use IO::Handle ;
 
+<<<<<<< HEAD:lib/Stem/Event/Queue.pm
 my( $self, $queue_read, $queue_write, $queue_read_event, $queue_has_event ) ;
+=======
+use base 'Exporter' ;
+our @EXPORT = qw( mark_not_empty ) ;
+>>>>>>> master:lib/Stem/Event/Queue.pm
 
 sub _init_event_queue {