Merge pull request #1117 from ajcasado/master

Remove a pushed non-resolved merge conflict
EtchedPixels · Nov 27, 2024 · 85262da · 85262da
2 parents e2fad6f + f741961
commit 85262da
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Kernel/dev/cpc/video.s b/Kernel/dev/cpc/video.s
@@ -336,12 +336,8 @@ reset_cursor_line:
         ld (de),a
 
         VIDEO_UNMAP
-<<<<<<< HEAD
-        ret
-=======
 	ret
 
->>>>>>> 9e6066d9ba890c01777baba4e6bb5ef289d9b802
 	.if CPCVID_ONLY
 _do_beep:
 	.endif