Skip to content

Commit 28a3694

Browse files
Merge pull request #8 from full-ownership/feature/intro
fix : resolving cache conflict
2 parents 6bdeb7b + 699eb67 commit 28a3694

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"fullpage.js": "^4.0.30",
1717
"i": "^0.3.7",
1818
"jquery": "^3.7.1",
19-
"i": "^0.3.7",
2019
"pinia": "^2.2.6",
2120
"typed.js": "^2.1.0",
2221
"vue": "^3.5.12",

src/Component/Introduction/Introduction2.vue

+3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<div class = "bg-blue-400 w-1/2">
1515
<div class="w-[200] text-center text-gray-800 text-6xl font-PretendardSemiBold ">
1616
2023.07.14
17+
</div>
18+
<div class="bg-gray-600 w-[100]">
19+
1720
</div>
1821
<div class="w-[200] text-center text-gray-800 text-6xl font-PretendardSemiBold mt-4">
1922
00상사 설립

0 commit comments

Comments
 (0)