fix conflicts with upstream
This commit is contained in:
commit
4396f4376a
1 changed files with 2 additions and 0 deletions
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
*.so
|
||||||
|
.idea
|
||||||
Loading…
Reference in a new issue