From c4192397627e1dd7f4eed5ad934dee584a8083f2 Mon Sep 17 00:00:00 2001
From: Alexander Borisov <566688@mail.ru>
Date: Wed, 29 Jan 2025 09:06:11 +1000
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B8=D0=BC=D1=8F=20=D0=BA=D0=BB=D0=B0?=
 =?UTF-8?q?=D1=81=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/filmstab.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/filmstab.py b/src/filmstab.py
index be57e8c..04c119e 100644
--- a/src/filmstab.py
+++ b/src/filmstab.py
@@ -69,11 +69,7 @@ if len(sys.argv) == 1 :
    sys.exit(1)
    
 
-<<<<<<< HEAD
-class Stablilizer:
-=======
 class FilmScanStablilizer:
->>>>>>> a216d1d788344c515a06be2bffb8066f358cdd4e
     
     fr_count = 0
     fr_cur = 0
@@ -353,11 +349,7 @@ alert("Keyframes are loaded.");
     
 if __name__ == '__main__':
     
-<<<<<<< HEAD
-    stab = Stablilizer()
-=======
     stab = FilmScanStablilizer()
->>>>>>> a216d1d788344c515a06be2bffb8066f358cdd4e
     stab.main()
     stab.writeAeScript()