fix conflicts with upstream

This commit is contained in:
dding3 2021-08-18 10:56:40 -07:00
commit 4396f4376a

2
.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
*.so
.idea