No .orig files

diff --git a/.gitignore b/.gitignore
index 7e4c07b2907600e9682394636595041d2b08d11e..17e8fd0ccbb0b1cb691e4ff75ddddd986bcbfcf0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 *.so
 *.egg
 *.egg-info
+*.orig
+*.rej
 .*.swp
 *~
 dist

diff --git a/naja/scenes/credits.py.orig b/naja/scenes/credits.py.orig
deleted file mode 100644 (file)
index 116bcfd..0000000
--- a/naja/scenes/credits.py.orig
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-Main menu scene.
-"""
-
-import pygame.locals as pgl
-
-from naja.scenes.scene import Scene
-from naja.widgets.text import TextWidget, TextBoxWidget
-from naja.events import SceneChangeEvent
-
-class CreditsScene(Scene):
-
-    base_menu = None
-
-    def __init__(self, state):
-        super(CreditsScene, self).__init__(state)
-<<<<<<< HEAD
-        self.widgets.append(TextWidget((120, 120), 'Credits', fontsize=32,
-                            colour='white'))
-        self.widgets.append(TextBoxWidget((120, 30),
-                                       'Your mom '
-                                       'A stranger \nA \nbag full of snakes', fontsize=32,
-                            colour='white', padding=1, border=1,
-                            bg_colour='black', border_colour='black',
-                            box_width=100))
-=======
-        self.add(TextWidget((60, 10), 'Credits', fontsize=32, colour='white'))
-        self.add(TextWidget((60, 30), 'Your mom\nA stranger', fontsize=32,
-                 colour='white'))
->>>>>>> 4e27b4e10d7fd4f66097ece17a8c51b80233a363
-
-    def handle_scene_event(self, ev):
-        if ev.type == pgl.KEYUP and ev.key in (pgl.K_q, pgl.K_ESCAPE):
-            from naja.scenes.menu import MenuScene
-            SceneChangeEvent.post(MenuScene)
-            return