2 changed files with 0 additions and 10 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,10 +6,6 @@ __pycache__/

 # C extensions
 *.so
-<<<<<<< HEAD
-=======
-
->>>>>>> a50fd0b ([0])
 .DS_Store
 # Distribution / packaging
 .Python
--- a/sobininaas/429.rtf
+++ b/sobininaas/429.rtf
@ -1,6 +0,0 @@
-{\rtf1\ansi\ansicpg1251\cocoartf2761
-\cocoatextscaling0\cocoaplatform0{\fonttbl}
-{\colortbl;\red255\green255\blue255;}
-{\*\expandedcolortbl;;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww11520\viewh8400\viewkind0
-}