plotflow
diff --git a/‎scripts/cart.js‎
Lines changed: 0 additions & 8 deletions b/‎scripts/cart.js‎
Lines changed: 0 additions & 8 deletions
diff --git a/‎styles/styles.css‎
Lines changed: 0 additions & 3 deletions b/‎styles/styles.css‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎success.html‎
Lines changed: 0 additions & 7 deletions b/‎success.html‎
Lines changed: 0 additions & 7 deletions
@@ -149,13 +149,6 @@
     if (cartBtn) { e.preventDefault(); openDrawer(); }
   });
 
-<<<<<<< HEAD
-  // public API
-  window.PlotflowCart = { add: add, remove: remove, clear: clear, open: openDrawer, count: count };
-
-  if (document.readyState === "loading") document.addEventListener("DOMContentLoaded", function () { build(); render(); });
-  else { build(); render(); }
-=======
   var toastEl, toastT;
   function toast(msg) {
     if (!toastEl) { toastEl = document.createElement("div"); toastEl.className = "cart-toast"; document.body.appendChild(toastEl); }
@@ -182,5 +175,4 @@
   function init() { build(); render(); checkCancelled(); }
   if (document.readyState === "loading") document.addEventListener("DOMContentLoaded", init);
   else { init(); }
->>>>>>> a4f47b5b80479b6bdd236703ae93d873d3c42872
 })();
@@ -222,8 +222,5 @@ footer .grain{opacity:.3}
 .cart-checkout{width:100%;background:var(--red);color:var(--white);font-weight:800;font-size:11px;letter-spacing:.14em;text-transform:uppercase;padding:14px;border:1px solid var(--red)}
 .cart-checkout:hover{background:var(--white);color:var(--ink);border-color:var(--white)}
 .cart-checkout:disabled{opacity:.45;cursor:not-allowed}
-<<<<<<< HEAD
-=======
 .cart-toast{position:fixed;left:50%;bottom:24px;transform:translateX(-50%) translateY(20px);z-index:95;background:var(--ink);color:var(--white);border:1px solid var(--line);padding:12px 18px;font-weight:700;font-size:11px;letter-spacing:.1em;text-transform:uppercase;opacity:0;transition:opacity .3s,transform .3s;pointer-events:none}
 .cart-toast.show{opacity:1;transform:translateX(-50%) translateY(0)}
->>>>>>> a4f47b5b80479b6bdd236703ae93d873d3c42872
@@ -17,8 +17,6 @@
 <link href="https://fonts.googleapis.com/css2?family=Archivo:ital,wght@0,400;0,500;0,600;0,700;0,800;0,900;1,600&family=Noto+Sans+JP:wght@500;700;900&display=swap" rel="stylesheet">
 <link rel="stylesheet" href="styles/tokens.css">
 <link rel="stylesheet" href="styles/styles.css">
-<<<<<<< HEAD
-=======
 <meta name="description" content="Order confirmed.">
 <link rel="canonical" href="https://plotflow.io/success.html">
 <meta name="robots" content="noindex,follow">
@@ -34,7 +32,6 @@
 <meta name="twitter:title" content="Order confirmed — PLOTFLOW*">
 <meta name="twitter:description" content="Order confirmed.">
 <meta name="twitter:image" content="https://plotflow.io/assets/og.png">
->>>>>>> a4f47b5b80479b6bdd236703ae93d873d3c42872
 </head>
 <body>
 
@@ -70,11 +67,7 @@ <h3>Thank you</h3>
       <div class="fc"><h5>Shop*</h5><a href="/#shop">All editions</a><a href="commissions.html">Commissions</a></div>
       <div class="fc"><h5>House*</h5><a href="/#process">Process</a><a href="manifesto.html">Manifesto</a><a href="contact.html">Contact</a></div>
       <div class="fc"><h5>Info*</h5><a href="shipping.html">Shipping</a><a href="returns.html">Returns</a><a href="faq.html">FAQ</a></div>
-<<<<<<< HEAD
-      <div class="fc"><h5>一筆書き</h5><a href="#">@plotflow</a><a href="#">Newsletter</a><a href="#">est. 2026</a></div>
-=======
       <div class="fc"><h5>一筆書き</h5><a href="https://instagram.com/plotflow" target="_blank" rel="noopener">@plotflow</a><a href="mailto:hello@plotflow.io?subject=Newsletter">Newsletter</a><span class="est">est. 2026</span></div>
->>>>>>> a4f47b5b80479b6bdd236703ae93d873d3c42872
     </div>
     <div class="foot-bot tiny"><span>© 2026 PLOTFLOW* — PLOTTED IN THE U.S.A.</span><span>一筆書き · ONE CONTINUOUS LINE</span></div>
   </div>