Skip to content

Commit 2600348

Browse files
committed
fix: resolve merge conflict in custom.css
2 parents 9bdbad1 + c58faab commit 2600348

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

src/css/custom.css

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2208,7 +2208,6 @@ main>div:not(.m-0) {
22082208
}
22092209
}
22102210

2211-
<<<<<<< HEAD
22122211
/* ===== HOVER ZOOM FOR BLOG IMAGES ===== */
22132212
.img-zoom {
22142213
overflow: hidden;
@@ -2228,8 +2227,6 @@ main>div:not(.m-0) {
22282227
transform: scale(1.08);
22292228
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.25);
22302229
}
2231-
=======
22322230
/* =====================================================
22332231
END SECTION 15
22342232
===================================================== */
2235-
>>>>>>> 68e7a063e97cfa48cb7a3ea5439585e06813bf6f

0 commit comments

Comments
 (0)