feat: conflict resolve

conflict resolve fix #164y
modern-agile-team · Oct 3, 2022 · a580995 · a580995
2 parents 4d56c8f + cd60237
commit a580995
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/App.tsx b/src/App.tsx
@@ -110,7 +110,6 @@ function App() {
         <Item />
         <Item />
       </Gallery>
-
       <Masonry id="['Masonry', 'ri:layout-masonry-line']">
         <Image
           subhead="hi"