From: Skullheadx <94652084+Skullheadx@users.noreply.github.com>
Date: Sun, 10 Jul 2022 03:03:11 +0000 (-0400)
Subject: Merge branch 'combat'
X-Git-Url: http://git.skullheadx.com/nixos/static/gitweb.js?a=commitdiff_plain;h=11ab094075d44c2ba39245f3cfb4a8ac005fafa1;p=Pygame-Jam.git

Merge branch 'combat'
---

11ab094075d44c2ba39245f3cfb4a8ac005fafa1
diff --cc Player.py
index 3a94e89,7da1794..e680210
--- a/Player.py
+++ b/Player.py
@@@ -5,7 -8,10 +5,8 @@@ from Actors import Acto
  from datetime import datetime, timedelta
  from Potion import Potion
  from Weapon import Melee
 -from CommonImports.colours import red, white
 -from Function.createText import createText
  
+ 
  class Player(Actor):
      scale = 100
      factor = 640 / scale