-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathtext.html
36 lines (29 loc) · 1.33 KB
/
text.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
</head>
<body>
<<<<<<< HEAD
<header>blah blah</header>
<h1>rojina
</h1>
<p>Hello</p>
<footer>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Numquam facere aspernatur repudiandae ipsam eius
et minima molestiae sit atque nobis ullam molestias, rem eaque unde. Totam excepturi voluptatem ullam alias!
</footer>
=======
<header>Lorem, ipsum dolor sit amet consectetur adipisicing elit. Delectus ad neque cupiditate necessitatibus
veritatis, velit consectetur quos dolor ratione at atque. Blanditiis, tempore magni id amet reprehenderit
aliquam voluptate veritatis.
Lorem ipsum dolor sit amet consectetur, adipisicing elit. At sit quidem esse commodi alias iure repudiandae
corrupti vel doloremque pariatur iste, aliquid illum non dicta culpa laudantium, autem eos placeat!</header>
<p>Hello</p>
<footer>Lorem ipsum, dolor sit amet consectetur adipisicing elit. Ea explicabo reiciendis vero voluptatem
exercitationem nisi impedit accusamus eligendi in expedita magnam iste dignissimos eius, aspernatur corrupti
omnis doloribus suscipit placeat.</footer>
>>>>>>> header
</body>
</html>