now fixed

Author: kexana

my-app/index.html

@@ -8,12 +8,8 @@
 		<link rel="preconnect" href="https://fonts.googleapis.com">
 		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 		<link href="https://fonts.googleapis.com/css2?family=Kanit:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">
-<<<<<<< HEAD
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<title>Course Compass</title>
-=======
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />		<title>Find my course</title>
->>>>>>> origin
 	</head>
 	<div id="root"></div>
 	<script type="module" src="/src/index.jsx"></script>