Build: (95c2d34) Fixed merge error

columbiaspace · Feb 22, 2024 · fb5544e · fb5544e
1 parent 4b1c94c
commit fb5544e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/asset-manifest.json b/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/css/main.40e8c394.css",
-    "main.js": "/static/js/main.6ec0e974.js",
+    "main.js": "/static/js/main.6ac05f9c.js",
     "static/js/453.8d3229d5.chunk.js": "/static/js/453.8d3229d5.chunk.js",
     "static/media/astronautstream.gif": "/static/media/astronautstream.7d8d9952861b7f7efdef.gif",
     "static/media/MapGif.gif": "/static/media/MapGif.12ba06edb899936b4e46.gif",
@@ -10,11 +10,11 @@
     "static/media/logo.jpg": "/static/media/logo.aab4311fbb1651b60680.jpg",
     "index.html": "/index.html",
     "main.40e8c394.css.map": "/static/css/main.40e8c394.css.map",
-    "main.6ec0e974.js.map": "/static/js/main.6ec0e974.js.map",
+    "main.6ac05f9c.js.map": "/static/js/main.6ac05f9c.js.map",
     "453.8d3229d5.chunk.js.map": "/static/js/453.8d3229d5.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.40e8c394.css",
-    "static/js/main.6ec0e974.js"
+    "static/js/main.6ac05f9c.js"
   ]
 }
diff --git a/index.html b/index.html
@@ -1 +1 @@
-<!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>Columbia SUITS</title><script defer="defer" src="/static/js/main.6ec0e974.js"></script><link href="/static/css/main.40e8c394.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>Columbia SUITS</title><script defer="defer" src="/static/js/main.6ac05f9c.js"></script><link href="/static/css/main.40e8c394.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/static/js/main.6ec0e974.js → static/js/main.6ac05f9c.js b/static/js/main.6ec0e974.js → static/js/main.6ac05f9c.js
diff --git a/static/js/main.6ec0e974.js.LICENSE.txt → static/js/main.6ac05f9c.js.LICENSE.txt b/static/js/main.6ec0e974.js.LICENSE.txt → static/js/main.6ac05f9c.js.LICENSE.txt
diff --git a/static/js/main.6ac05f9c.js.map b/static/js/main.6ac05f9c.js.map
diff --git a/static/js/main.6ec0e974.js.map b/static/js/main.6ec0e974.js.map
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!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>Columbia SUITS</title><script defer="defer" src="/static/js/main.6ec0e974.js"></script><link href="/static/css/main.40e8c394.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>Columbia SUITS</title><script defer="defer" src="/static/js/main.6ac05f9c.js"></script><link href="/static/css/main.40e8c394.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>