Skip to content

Commit

Permalink
merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@bout3fiddy
bout3fiddy committed Apr 16, 2024
1 parent 6b30e47 commit 0e5223d
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,5 @@ venv/
bvenv/
.env
.hypothesis/
<<<<<<< HEAD
=======
.gz
.json.gz
>>>>>>> main

0 comments on commit 0e5223d

Please sign in to comment.