merge conflict test

2023-05-17 01:00:26 -07:00 · 2023-05-17 01:00:26 -07:00 · cd7861c8cb
commit cd7861c8cb
parent 5b940679a9
1 changed files with 1 additions and 0 deletions
--- a/arctic-masher.py
+++ b/arctic-masher.py
@ -86,6 +86,7 @@ while True:
    for player in players:
        player.sprite.x = (tile*player.x)+2
        player.sprite.y = (tile*player.y)+2
+        # this is a comment
        pygame.draw.rect(screen, player.color, player.sprite)

    pygame.display.flip()