feat: resolve conflict

deco-sites · Nov 25, 2024 · 965c7b2 · 965c7b2
2 parents 6df07dd + 1654f77
commit 965c7b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/fresh.gen.ts b/fresh.gen.ts
@@ -2,12 +2,12 @@
 // This file SHOULD be checked into source version control.
 // This file is automatically updated during development when running `dev.ts`.
 
-import * as $_app from "./routes/_app.tsx";
+import type { Manifest } from "$fresh/server.ts";
 import * as $MenuInstitutionalMobile from "./islands/MenuInstitutionalMobile.tsx";
 import * as $MinicartFooter from "./islands/MinicartFooter.tsx";
 import * as $Notify from "./islands/Notify.tsx";
 import * as $ScrollButton from "./islands/ScrollButton.tsx";
-import type { Manifest } from "$fresh/server.ts";
+import * as $_app from "./routes/_app.tsx";
 
 const manifest = {
   routes: {

diff --git a/static/tailwind.css b/static/tailwind.css
@@ -4740,6 +4740,9 @@ details.collapse summary::-webkit-details-marker {
 .rounded-none {
   border-radius: 0px;
 }
+.rounded-sm {
+  border-radius: 0.125rem;
+}
 .rounded-b-\[5px\] {
   border-bottom-right-radius: 5px;
   border-bottom-left-radius: 5px;