Merge remote changes and resolve conflicts
This commit is contained in:
commit
dda11c6dc5
3 files changed
+13
-4
No files matched your search
+1
-1
@@ -33,4 +33,4 @@ wheels/
|
||||
|
||||
# OS
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
Thumbs.db
|
||||
Reference in new issue
Block a user