corrected typo on line 139 and resolved conflict

This commit is contained in:
Kacey Bennett 2016-07-12 08:36:55 -05:00
parent 3f4cd123d8
commit 859e2529f4

View File

@ -136,7 +136,7 @@
# THE FOLLOWING ARE OF GENERAL INTEREST --
#
# REMARKS CARDS PRECEDE THE REFERENCED SYMBOL DEFINITION. SEE SYMBOL
# TABLE TO FIND APPROPRIATE PACE NUMBERS.
# TABLE TO FIND APPROPRIATE PAGE NUMBERS.
#
# NVSUB CALLING POINT FOR INTERNAL USE OF PINBALL.
# OF RELATED INTEREST NVSBWAIT