aboutsummaryrefslogtreecommitdiff
path: root/.nasm/segments.txt
diff options
context:
space:
mode:
Diffstat (limited to '.nasm/segments.txt')
-rw-r--r--.nasm/segments.txt6
1 files changed, 1 insertions, 5 deletions
diff --git a/.nasm/segments.txt b/.nasm/segments.txt
index e5b18a5..0b837c2 100644
--- a/.nasm/segments.txt
+++ b/.nasm/segments.txt
@@ -1,8 +1,4 @@
- HEADER: 16/16 (100%)
-<<<<<<< HEAD
-- ROM0: 6609/32762 (20.17%)
-=======
-- ROM0: 6658/32762 (20.32%)
->>>>>>> 823e1f6ed102 (State game over only when all players are dead)
+- ROM0: 6671/32762 (20.36%)
- ROMV: 6/6 (100%)
- ROM2: 8192/8192 (100%)