Skip to content

Commit b8bf83c

Browse files
DaltheCowDaltheCow
committed
merge main
1 parent a281829 commit b8bf83c

File tree

2 files changed

+0
-109
lines changed

2 files changed

+0
-109
lines changed

‎.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,4 @@ src/ui/next-env.d.ts
221221
!package.json
222222
!package-lock.json
223223
!.eslintrc.json
224-
<<<<<<< HEAD
225224
!tsconfig.json
226-
=======
227-
!tsconfig.json
228-
>>>>>>> implement-base-ui-app

‎package-lock.json

Lines changed: 0 additions & 105 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)