Alexander_Franklin/arctic-masher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflict test

Browse Source
This commit is contained in:
PAlexanderFranklin 2023-05-17 01:00:26 -07:00
parent 5b940679a9
commit cd7861c8cb
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arctic-masher.py
View File

@ -86,6 +86,7 @@ while True:
for player in players: for player in players:
player.sprite.x = (tile*player.x)+2 player.sprite.x = (tile*player.x)+2
player.sprite.y = (tile*player.y)+2 player.sprite.y = (tile*player.y)+2
# this is a comment
pygame.draw.rect(screen, player.color, player.sprite) pygame.draw.rect(screen, player.color, player.sprite)
pygame.display.flip() pygame.display.flip()