Merge branch 'main' of https://github.com/Farad77/Bidule

2024-10-22 10:39:58 +04:00
parent d5f062d876 53119dfe17
commit 6928ff81ec
10 changed files with 22 additions and 4 deletions
@@ -0,0 +1,8 @@
+<<<<<<< HEAD
+AHAHAHHAHA GOTAGAAAAAAA, alors les gentle mates
+=======
+jkerklg,eorfiopefr
+
+AHAHAHHAHA GOTAGAAAAAAA, alors les gentle mate
+>>>>>>> d6c65328bfa0b5937a6a1944aeafa12e384d5216
+>>>>>>> df64fee8be500591b0a07ea19e78f5f480ec4f0e
@@ -1,4 +0,0 @@
-jkerklg,eorfiopefr
-
-AHAHAHHAHA GOTAGAAAAAAA, alors les gentle mate
->>>>>>> d6c65328bfa0b5937a6a1944aeafa12e384d5216
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+    
+    <link rel='stylesheet' type='text/css' media='screen' href='style.css'>
+    <script src='script.js'></script>
+</head>
+<body>
+    
+</body>
+</html>