MergeConflict-Practice/index.html at master · AFutureWebDev/MergeConflict-Practice · GitHub

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
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
    <link href="https://fonts.googleapis.com/css?family=Crafty+Girls|Rouge+Script|Sedgwick+Ave" rel="stylesheet">
    <link rel="stylesheet" href="styles.css">
    <title>Merge Conflicts</title>
    <link rel="stylesheet" href="merge.css">
</head>

<body>
    <div class="blue">
        <h3>Square 1</h3>
    </div>
    <div class="green">
        <h3>Square 2</h3>
    </div>
    <div class="purple">

    <div class="square one">
        <h3>Square 1</h3>
    </div>
    <div class="square two">
        <h3>Square 2</h3>
    </div>
    <div class="square three">
        <h3>Square 3</h3>
    </div>
</body>
</html>