*** empty log message ***

[h316.git] / lib / iolib / recipe / dap-lib.recipe

diff --git a/lib/iolib/recipe/dap-lib.recipe b/lib/iolib/recipe/dap-lib.recipe
index 774ad71235867315c600d2040a533038de49d150..c4fb208394729a3e7a43ed5cec67b9aef429d4e8 100644 (file)
--- 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