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

diff --git a/lib/Stem/Event/Queue.pm b/lib/Stem/Event/Queue.pm
index c473237..1354ca8 100644
--- a/lib/Stem/Event/Queue.pm
+++ b/lib/Stem/Event/Queue.pm
@@ -49,12 +49,7 @@ 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 {