fix(codeblock): Change output to a codeblock

spellshift · Oct 8, 2023 · 1ad1636 · 1ad1636
1 parent ee89aaa
commit 1ad1636
Show file tree

Hide file tree

Showing 5 changed files with 379 additions and 21 deletions.
diff --git a/tavern/internal/www/build/asset-manifest.json b/tavern/internal/www/build/asset-manifest.json
@@ -1,6 +1,5 @@
 {
   "files": {
-<<<<<<< HEAD
     "main.css": "/static/css/main.d3a1f05a.css",
     "main.js": "/static/js/main.dce5904d.js",
     "static/js/787.4af0fb89.chunk.js": "/static/js/787.4af0fb89.chunk.js",
@@ -13,19 +12,5 @@
   "entrypoints": [
     "static/css/main.d3a1f05a.css",
     "static/js/main.dce5904d.js"
-=======
-    "main.css": "/static/css/main.35a119f9.css",
-    "main.js": "/static/js/main.56d1c55c.js",
-    "static/js/787.4af0fb89.chunk.js": "/static/js/787.4af0fb89.chunk.js",
-    "static/media/eldrich.png": "/static/media/eldrich.a80c74e8249d2461e174.png",
-    "index.html": "/index.html",
-    "main.35a119f9.css.map": "/static/css/main.35a119f9.css.map",
-    "main.56d1c55c.js.map": "/static/js/main.56d1c55c.js.map",
-    "787.4af0fb89.chunk.js.map": "/static/js/787.4af0fb89.chunk.js.map"
-  },
-  "entrypoints": [
-    "static/css/main.35a119f9.css",
-    "static/js/main.56d1c55c.js"
->>>>>>> fix(env): Add envs for local running
   ]
 }
diff --git a/tavern/internal/www/build/index.html b/tavern/internal/www/build/index.html
@@ -1,5 +1 @@
-<<<<<<< HEAD
 <!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script defer="defer" src="/static/js/main.dce5904d.js"></script><link href="/static/css/main.d3a1f05a.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
-=======
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script defer="defer" src="/static/js/main.56d1c55c.js"></script><link href="/static/css/main.35a119f9.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
->>>>>>> fix(env): Add envs for local running