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

2024-10-22 09:38:05 +04:00
parent c8701f7b05 8331ff78dd
commit 61029654f5
7 changed files with 24 additions and 1 deletions
@@ -0,0 +1 @@
+cours github expernet
@@ -1 +1,5 @@
+<<<<<<< HEAD
 C'est une bonne situation ça scribe ?
+=======
+poney unijambiste
+>>>>>>> 8331ff78dd43c2c192752092ee9a1a70218f6a32
@@ -1 +1,2 @@
 Théo
+aled
@@ -0,0 +1 @@
+Test push github
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset='utf-8'>
+    <meta http-equiv='X-UA-Compatible' content='IE=edge'>
+    <title>Page Title</title>
+    <meta name='viewport' content='width=device-width, initial-scale=1'>
+    <link rel='stylesheet' type='text/css' media='screen' href='main.css'>
+    <script src='main.js'></script>
+</head>
+<body>
+    
+</body>
+</html>
@@ -0,0 +1,2 @@
+SG le best
+aled