X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=lib%2Fiolib%2Frecipe%2Fdap-lib.recipe;h=c4fb208394729a3e7a43ed5cec67b9aef429d4e8;hb=0b8fa8754893006b8a88448dbd32ac21ce911731;hp=774ad71235867315c600d2040a533038de49d150;hpb=c9e18ec4ab4aebbd0821fe339729ff3c0b70ea61;p=h316.git

diff --git a/lib/iolib/recipe/dap-lib.recipe b/lib/iolib/recipe/dap-lib.recipe
index 774ad71..c4fb208 100644
--- a/lib/iolib/recipe/dap-lib.recipe
+++ b/lib/iolib/recipe/dap-lib.recipe
@@ -7,15 +7,10 @@ obj/O$PB
 # Paper tape listing routine - Lets see, if DAP can handle that
 obj/O$PL
 
-<<<<<<< dap-lib.recipe
 # O$AL ASR comfort routine
 obj/O$AL
-=======
-# O$AL ASR comfort routine Hm, let's try it out....
-obj/O$AL
->>>>>>> 1.3
 
-# Huge Line printer routine Rocking now?
+# Huge Line printer routine - rocking now?
 obj/O$LA
 
 # Read Paper tape sources