merging

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

diff --git a/lib/Stem/Event/Queue.pm b/lib/Stem/Event/Queue.pm
index 53db4fa..c473237 100644 (file)
--- 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 {