Skip to content

Commit 3439f97

Browse files
committed
Resolved Conflicts
2 parents 699f5ae + c07cda7 commit 3439f97

File tree

9 files changed

+4
-300
lines changed

9 files changed

+4
-300
lines changed

.astro/collections/articles.schema.json

Lines changed: 0 additions & 44 deletions
This file was deleted.

.astro/collections/blogs.schema.json

Lines changed: 0 additions & 68 deletions
This file was deleted.

.astro/content-assets.mjs

Lines changed: 0 additions & 1 deletion
This file was deleted.

.astro/content-modules.mjs

Lines changed: 0 additions & 1 deletion
This file was deleted.

.astro/content.d.ts

Lines changed: 0 additions & 182 deletions
This file was deleted.

.vscode/dictionaries/project-words.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ Threazip
4141
vaul
4242
venv
4343
waitlist
44-
werkzeug
44+
werkzeug

.vscode/dictionaries/team-member.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ soumyanil
88
xkeshav
99
aditya
1010
vansh
11-
vamil
11+
vamil

.vscode/tailwind.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@
5252
]
5353
}
5454
]
55-
}
55+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@
8787
"prettier-plugin-tailwindcss": "0.6.8",
8888
"shx": "0.3.4"
8989
}
90-
}
90+
}

0 commit comments

Comments
 (0)