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

diff --git a/lib/iolib/recipe/dap-lib.recipe b/lib/iolib/recipe/dap-lib.recipe
index 65e0047..774ad71 100644
--- a/lib/iolib/recipe/dap-lib.recipe
+++ b/lib/iolib/recipe/dap-lib.recipe
@@ -7,8 +7,13 @@ 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?
 obj/O$LA