From a5ba2e52771ab8105466084c10a29b3330c9cf20 Mon Sep 17 00:00:00 2001
From: Johannes Theiner <j.theiner@live.de>
Date: Thu, 6 Dec 2018 09:50:49 +0100
Subject: [PATCH] welp

---
 src/asm/a4.asm | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/src/asm/a4.asm b/src/asm/a4.asm
index 121a342..a1cd85a 100644
--- a/src/asm/a4.asm
+++ b/src/asm/a4.asm
@@ -13,11 +13,7 @@ status		db 00000000b	; Statusbyte
 
 tcounts		db 0		; Impulszaehler fuer Servo, Vorwaertszaehler
 tcountv		dw 100 * twait	; Impulszaehler fuer Verzoegerung * 10ms
-<<<<<<< HEAD
 				; Rueckwaertszaehler
-=======
-count		db 8		; Rueckwaertszaehler
->>>>>>> 0aa2c30f62e6ec53f2e21b4039abeb1581d460d8
 frei		db 'frei  ', 0	; Texte
 belegt		db 'belegt  ', 0
 
@@ -95,7 +91,6 @@ again:
 	
 	times shcnt shr ax, 1
 
-<<<<<<< HEAD
 	cmp ax, 0x0
 	jle ifzero
 
@@ -124,23 +119,6 @@ ifzero:
 	
 	
 	jmp again
-=======
-	;cmp ax, 0x0
-	;jbe ifzero
-
-	jmp again
-
-
-ifzero: 
-	mov ah, 2
-	mov dl, 7
-	mov bx, frei
-	int 6
-	mov byte [status], pieces << shcnt
-	
-	
-	ret
->>>>>>> 0aa2c30f62e6ec53f2e21b4039abeb1581d460d8
 
 
 ; Initialisierung Controller und Interruptsystem
@@ -251,7 +229,4 @@ isr_servotimer_out: ; Ausgang aus dem Service
 	iret
  
 
-<<<<<<< HEAD
 
-=======
->>>>>>> 0aa2c30f62e6ec53f2e21b4039abeb1581d460d8