Skip to content

Commit 4c6722f

Browse files
grevicocgrevicoc
committed
fix: resolve conflicts
2 parents ff45cc4 + 29762d1 commit 4c6722f

31 files changed

Lines changed: 52244 additions & 217 deletions

.env renamed to .env.production

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VITE_APP_TITLE=KATITB2022
2-
VITE_GHOST_API_URL= http://localhost:2368
3-
VITE_GHOST_API_CONTENT_API_KEY=c11259cec5c2cfa1a037f3f5a4
2+
VITE_GHOST_API_URL=http://159.223.61.85:3000
3+
VITE_GHOST_API_CONTENT_API_KEY=dde21a955ecdf2da49b79af663
44
VITE_GHOST_ADMIN_API_KEY=62dfe2ad0a5d5300017f6188:b67d6b3edf54da129c58b9423506a0b7f1f6b686c527dae9114da61e8c9c6e0d
5-
VITE_IP_ADDRESS=159.223.61.85
5+
VITE_IP_ADDRESS=159.223.61.85

‎package-lock.json‎

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

‎package.json‎

100644100755
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"react-twitter-widgets": "^1.11.0"
3535
},
3636
"devDependencies": {
37+
"@shrutibalasa/tailwind-grid-auto-fit": "^1.1.0",
3738
"@types/react": "^18.0.0",
3839
"@types/react-dom": "^18.0.0",
3940
"@types/tryghost__content-api": "^1.3.11",

‎src/assets/images/chevron-left.svg‎

100644100755
File mode changed.

‎src/assets/images/chevron-right.svg‎

100644100755
File mode changed.

‎src/assets/images/oskm-logo.svg‎

100644100755
File mode changed.

‎src/assets/images/vistock1.svg‎

100644100755
File mode changed.

‎src/assets/images/vistock2.svg‎

100644100755
File mode changed.

‎src/assets/images/vistock3.svg‎

100644100755
File mode changed.

‎src/assets/images/vistock4.svg‎

100644100755
File mode changed.

0 commit comments

Comments
 (0)