resolved merge conflicts for different commit histories

eichel-choi · Nov 2, 2023 · d0ac55c · d0ac55c
2 parents ff7e898 + 45d1366
commit d0ac55c
Show file tree

Hide file tree

Showing 21 changed files with 44 additions and 0 deletions.
diff --git a/.nojekyll b/.nojekyll
diff --git a/404.html b/404.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html><html><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><title>404: This page could not be found</title><meta name="next-head-count" content="3"/><link rel="preload" href="/portfolio/_next/static/css/a96035c533236f5e.css" as="style"/><link rel="stylesheet" href="/portfolio/_next/static/css/a96035c533236f5e.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/portfolio/_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="/portfolio/_next/static/chunks/webpack-158ba86662020c04.js" defer=""></script><script src="/portfolio/_next/static/chunks/framework-7dc8a65f4a0cda33.js" defer=""></script><script src="/portfolio/_next/static/chunks/main-2d2e561236ca3474.js" defer=""></script><script src="/portfolio/_next/static/chunks/pages/_app-29bc13de28cf3fe8.js" defer=""></script><script src="/portfolio/_next/static/chunks/pages/_error-a4ba2246ff8fb532.js" defer=""></script><script src="/portfolio/_next/static/-oQd7q9olPoxoWMTr2hWX/_buildManifest.js" defer=""></script><script src="/portfolio/_next/static/-oQd7q9olPoxoWMTr2hWX/_ssgManifest.js" defer=""></script></head><body><div id="__next"><div style="font-family:-apple-system, BlinkMacSystemFont, Roboto, &quot;Segoe UI&quot;, &quot;Fira Sans&quot;, Avenir, &quot;Helvetica Neue&quot;, &quot;Lucida Grande&quot;, sans-serif;height:100vh;text-align:center;display:flex;flex-direction:column;align-items:center;justify-content:center"><div><style>
+                body { margin: 0; color: #000; background: #fff; }
+                .next-error-h1 {
+                  border-right: 1px solid rgba(0, 0, 0, .3);
+                }
+
+                @media (prefers-color-scheme: dark) {
+                  body { color: #fff; background: #000; }
+                  .next-error-h1 {
+                    border-right: 1px solid rgba(255, 255, 255, .3);
+                  }
+                }</style><h1 class="next-error-h1" style="display:inline-block;margin:0;margin-right:20px;padding:0 23px 0 0;font-size:24px;font-weight:500;vertical-align:top;line-height:49px">404</h1><div style="display:inline-block;text-align:left;line-height:49px;height:49px;vertical-align:middle"><h2 style="font-size:14px;font-weight:normal;line-height:49px;margin:0;padding:0">This page could not be found<!-- -->.</h2></div></div></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"-oQd7q9olPoxoWMTr2hWX","assetPrefix":"/portfolio","runtimeConfig":{"basePath":"/portfolio"},"nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
diff --git a/_next/static/-oQd7q9olPoxoWMTr2hWX/_buildManifest.js b/_next/static/-oQd7q9olPoxoWMTr2hWX/_buildManifest.js
diff --git a/_next/static/-oQd7q9olPoxoWMTr2hWX/_ssgManifest.js b/_next/static/-oQd7q9olPoxoWMTr2hWX/_ssgManifest.js
@@ -0,0 +1 @@
+self.__SSG_MANIFEST=new Set,self.__SSG_MANIFEST_CB&&self.__SSG_MANIFEST_CB();
diff --git a/_next/static/chunks/2cca2479-049829e7895d8a4a.js b/_next/static/chunks/2cca2479-049829e7895d8a4a.js
diff --git a/_next/static/chunks/574-2538001f65255a58.js b/_next/static/chunks/574-2538001f65255a58.js
diff --git a/_next/static/chunks/603-ee7dd379760e349b.js b/_next/static/chunks/603-ee7dd379760e349b.js
diff --git a/_next/static/chunks/framework-7dc8a65f4a0cda33.js b/_next/static/chunks/framework-7dc8a65f4a0cda33.js
diff --git a/_next/static/chunks/main-2d2e561236ca3474.js b/_next/static/chunks/main-2d2e561236ca3474.js
diff --git a/_next/static/chunks/pages/_app-29bc13de28cf3fe8.js b/_next/static/chunks/pages/_app-29bc13de28cf3fe8.js
diff --git a/_next/static/chunks/pages/_error-a4ba2246ff8fb532.js b/_next/static/chunks/pages/_error-a4ba2246ff8fb532.js
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		self.__SSG_MANIFEST=new Set,self.__SSG_MANIFEST_CB&&self.__SSG_MANIFEST_CB();