fix the conflict!

README.md

@@ -1,4 +1,4 @@
-# Learning OSS development through GitHub
+# Learning OSS development through GitHub
 
 
 
@@ -19,11 +19,10 @@
 | Minwoo Son	  | Student    |     |
 | Jeongin Lee   | Student.   |     |
 | Minwoo Son.   | Student    |     |
-<<<<<<< HEAD
 | Jeongin Lee   | Student.   |     |
 | Minwoo Son.   | Student    |     |
-=======
->>>>>>> 5dc3e8a29c487904e9840923b1cad39d4d476d55
+| Jeongin Lee   | Student.   |     |
+| Minwoo Son.   | Student    |     |
 | Kim Dain      | Student    |     |
 | Jeongin Lee   | Student    |     |
 | YK            | Student    |     |

gameFunctions.py

@@ -5,19 +5,14 @@
 import sounds
 from time import sleep
 from alien import Alien
-<<<<<<< HEAD
 import random
-=======
->>>>>>> 5dc3e8a29c487904e9840923b1cad39d4d476d55
+import random
 from settings import Settings
 import random
 
 pauseBtnState = 1
 back = False
-<<<<<<< HEAD
 
-=======
->>>>>>> 5dc3e8a29c487904e9840923b1cad39d4d476d55
 from bullet import Bullet, SpecialBullet
 from item import Item
 
@@ -360,7 +355,7 @@ def updateInvincibility(setting, screen, ship):
 def updateInvineffect(setting,screen,ship):
 	if pg.time.get_ticks() - setting.newStartTime < setting.invincibileTime:
 		image = pg.image.load('gfx/image_shield.png')
-		screen.blit(image, (ship.rect.x -7 , ship.rect.y ))            
+		screen.blit(image, (ship.rect.x -7 , ship.rect.y ))
 
 def updateAliens(setting, stats, sb, screen, ship, aliens, bullets, eBullets):
     """Update the aliens"""
@@ -492,7 +487,7 @@ def checkBulletAlienCol(setting, screen, stats, sb, ship, aliens, bullets, eBull
                 if setting.probabilityHeal+setting.probabilityTime+setting.probabilityShield<i<=setting.probabilityHeal+setting.probabilityTime+setting.probabilityShield+setting.probabilitySpeed:
                     createItem(setting, screen, stats, alien.rect.x, alien.rect.y, 4, items)
                 aliens.remove(alien)
-               
+
 
         # Increase the ultimate gauge, upto 100
         if not collisions[alien][0].isUltimate:

main.py

@@ -68,16 +68,15 @@ def runGame():
     speedButtons = ["fast","middle","slow","menu"]
 
     soundButtons =["loud","low","menu"]
-<<<<<<< HEAD
     settingsMenuButtons = ["menu", "invert","speed setting","quit"]
     speedButtons = ["fast","middle","slow"]
-=======
->>>>>>> 5dc3e8a29c487904e9840923b1cad39d4d476d55
+    settingsMenuButtons = ["menu", "invert","speed setting","quit"]
+    speedButtons = ["fast","middle","slow"]
     settingsMenuButtons = ["menu", "invert","speed setting","quit"]
     speedButtons = ["fast","middle","slow"]
     settingsMenuButtons = ["menu", "invert","speed setting","quit"]
     speedButtons = ["fast","middle","slow","menu"]
-    
+
     bgManager = BackgroundManager(screen)
     bgManager.setFillColor((0, 0, 0))
     bgManager.addBackground("universe_1", "gfx/backgrounds/stars_back.png", 0, 1)

sounds.py

@@ -49,11 +49,9 @@
 explosion_sound.set_volume(0.15)
 
 enemy_explosion_sound = pg.mixer.Sound('sound_effects/enemy_explosion.wav')
-<<<<<<< HEAD
 enemy_explosion_sound.set_volume(0.4)
-=======
+enemy_explosion_sound.set_volume(0.4)
 enemy_explosion_sound.set_volume(0.4)
 
 enemy_damaged_sound = pg.mixer.Sound('sound_effects/enemy_damaged.wav')
 enemy_damaged_sound.set_volume(0.1)
->>>>>>> 5dc3e8a29c487904e9840923b1cad39d4d476d55

speedMenu.py

@@ -59,11 +59,10 @@ def buttonAction(stats, selectedName, setting):
         setting.gameSpeed = 'slow'
         stats.setGameLoop('settingsMenu')
     elif selectedName == 'menu':
-<<<<<<< HEAD
          stats.setGameLoop('settingsMenu')
-=======
         stats.setGameLoop('settingsMenu')
->>>>>>> 5dc3e8a29c487904e9840923b1cad39d4d476d55
+         stats.setGameLoop('settingsMenu')
+        stats.setGameLoop('settingsMenu')
     elif selectedName == 'quit':
         pg.time.delay(300)
         sys.exit()