Inconsequential revisions.

Serioussam24 · May 27, 2011 · e829b57 · e829b57
2 parents 8679bae + 807f2a1
commit e829b57
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/DuckLib.py b/DuckLib.py
@@ -9,6 +9,7 @@
 pygame.init()
 
 #Load in images
+<<<<<<< HEAD
 dogImg      =  [pygame.image.load("DogIdle.gif"),
                 pygame.image.load("DogDuck.gif")]
 duckImg     = [[pygame.image.load("duckUD1.gif"),
@@ -20,6 +21,19 @@
                [pygame.image.load("DuckShot.gif")],
                [pygame.image.load("DuckFall.gif"),
                 pygame.transform.flip(pygame.image.load("DuckFall.gif"), True, False)]]
+=======
+dogImg = [pygame.image.load("DogIdle.gif"),
+          pygame.image.load("DogDuck.gif")]
+duckImg = [[pygame.image.load("DuckUD1.gif"),
+            pygame.image.load("DuckUD2.gif"),
+            pygame.image.load("DuckUD3.gif")],
+           [pygame.image.load("DuckF1.gif"),
+            pygame.image.load("DuckF2.gif"),
+            pygame.image.load("DuckF3.gif")],
+           [pygame.image.load("DuckShot.gif")],
+           [pygame.image.load("DuckFall.gif"),
+            pygame.transform.flip(pygame.image.load("DuckFall.gif"), True, False)]]
+>>>>>>> 807f2a1445c56b1e479d2d67e67c99226717903b
 negaDuckImg = [[pygame.image.load("DarkwingSp.gif")],
                [pygame.image.load("DarkwingFlap.gif"),
                 pygame.image.load("DarkwingFlap2.gif")]]