Compare commits
No commits in common. "b849e3a7bcb90d4fdecaf65d6d2c44e19547a6fe" and "4b24d66ab7fb58628e57f1b838d1b2214322a24d" have entirely different histories.
b849e3a7bc
...
4b24d66ab7
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -6,10 +6,6 @@ __pycache__/
|
||||||
|
|
||||||
# C extensions
|
# C extensions
|
||||||
*.so
|
*.so
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
|
|
||||||
>>>>>>> a50fd0b ([0])
|
|
||||||
.DS_Store
|
.DS_Store
|
||||||
# Distribution / packaging
|
# Distribution / packaging
|
||||||
.Python
|
.Python
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
{\rtf1\ansi\ansicpg1251\cocoartf2761
|
|
||||||
\cocoatextscaling0\cocoaplatform0{\fonttbl}
|
|
||||||
{\colortbl;\red255\green255\blue255;}
|
|
||||||
{\*\expandedcolortbl;;}
|
|
||||||
\paperw11900\paperh16840\margl1440\margr1440\vieww11520\viewh8400\viewkind0
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user