Compare commits
No commits in common. "0531529b1b28dc0aa1830f60f3a6f81f43f36182" and "131dce190d868ac49abd016535c4eee25e7a5db4" have entirely different histories.
0531529b1b
...
131dce190d
24
index.html
24
index.html
@ -1,24 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<<<<<<< HEAD
|
|
||||||
<html lang="pl">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=git, initial-scale=1.0">
|
|
||||||
<title>git_cwiczenie</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<h1> Uczymy się GIT-a</h1>
|
|
||||||
<p> Tu umieścimy hiper fajną tabelę</p>
|
|
||||||
=======
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=git, initial-scale=1.0">
|
|
||||||
<title>GIT</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<h1>Uczymy się GIT-a</h1>
|
|
||||||
<p> A tu będzie piękna galeria zdjęć</p>
|
|
||||||
>>>>>>> galeria
|
|
||||||
</body>
|
|
||||||
</html>
|
|
Loading…
Reference in New Issue
Block a user