File tree Expand file tree Collapse file tree 1 file changed +16
-0
lines changed Expand file tree Collapse file tree 1 file changed +16
-0
lines changed Original file line number Diff line number Diff line change 28
28
margin : 0.67em 0 ;
29
29
}
30
30
31
+ <<<<<<< HEAD
31
32
/* Grouping content */
32
33
/* ========================================================================== */
34
+ = = = = = = =
35
+ /* Grouping content
36
+ ========================================================================== */
37
+
38
+ /**
39
+ * 1. Add the correct box sizing in Firefox.
40
+ * 2. Hide the overflow in Edge and IE.
41
+ */
42
+ > > > > > > > 4a8722a6a0e36d76bf3e7340d33619905b35b6cb
33
43
34
44
/* Improve appearance of horizontal rules */
35
45
hr {
46
+ <<<<<<< HEAD
36
47
box- sizing: content- box;
37
48
height: 0;
38
49
overflow: vis ible;
50
+ = = = = = = =
51
+ box- sizing: content- box; /* 1 */
52
+ height: 0; /* 1 */
53
+ overflow: hidden; /* 2 */
54
+ > > > > > > > 4a8722a6a0e36d76bf3e7340d33619905b35b6cb
39
55
}
40
56
41
57
/* Enhance preformatted text display */
You can’t perform that action at this time.
0 commit comments