upd-last

index.html

@@ -11,11 +11,19 @@
 	<title>viGU - Видеоредактор</title>
 	<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
 		integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous">
+<<<<<<< HEAD
 	<!-- <link rel="preload" href="/css/style.css" as="style"> -->	
 	<link rel="preload" href="css/preload.css" as="style">
 	<link rel="preload" href="js/preload.js" as="script">
 	<link rel="stylesheet" href="css/style.css">
 	<link rel="stylesheet" href="css/timeline.css">
+=======
+	<!-- <link rel="preload" href="/css/style.css" as="style"> -->
+	<link rel="preload" href="/SkoolHack/css/preload.css" as="style">
+	<link rel="preload" href="/SkoolHack/js/preload.js" as="script">
+	<link rel="stylesheet" href="/SkoolHack/css/style.css">
+	<link rel="stylesheet" href="/SkoolHack/css/timeline.css">
+>>>>>>> dae142b63c4c5e30225c68d41a4d647841f0fa3d
 	<link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined" rel="stylesheet" />
 	<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 	<link href="https://fonts.googleapis.com/css2?family=Montserrat: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&amp;display=swap" rel="stylesheet">
@@ -274,4 +282,4 @@ <h5 class="modal-title">Удаление файла</h5>
 	<script src="js/main.js"></script>
 
 </body>
-</html>
+</html>