Skip to content

Commit

Permalink
git: conflict 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
@SeungGwan123
SeungGwan123 committed Nov 7, 2024
2 parents 286b9b7 + 12fdf0b commit 26b9e8e
Show file tree
Hide file tree
Showing 2 changed files with 8,921 additions and 8,918 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
.env
=======
.env
<<<<<<< HEAD

yarn.lock
>>>>>>> 1f2b3f46087d4b95bb8401706d2482a5da67ba3d
=======
>>>>>>> 12fdf0b633fa25d28868170a725bcd9d7b78bf3b
Loading

0 comments on commit 26b9e8e

Please sign in to comment.