Skip to content

Commit 4c675af

Browse files
committed
[css-flexbox] Ugh, resolve conflict.
1 parent d75a69b commit 4c675af

2 files changed

Lines changed: 0 additions & 8 deletions

File tree

css-flexbox/Overview.bs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1732,11 +1732,7 @@ Cross-axis Alignment: the 'align-items' and 'align-self' properties</h3>
17321732
<p>
17331733
A value of <dfn value for=align-self>auto</dfn> for 'align-self'
17341734
computes to the value of 'align-items' on the element’s parent,
1735-
<<<<<<< local
1736-
or <a value for=align-self>stretch</a> if the element has no parent.
1737-
=======
17381735
or ''align-self/stretch'' if the element has no parent.
1739-
>>>>>>> other
17401736
The alignments are defined as:
17411737

17421738
<dl dfn-type=value dfn-for="align-items align-self">

css-flexbox/Overview.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1752,11 +1752,7 @@ <h3 class="heading settled heading" data-level=8.3 id=align-items-property><span
17521752
<p>
17531753
A value of <dfn class=css-code data-dfn-for=align-self data-dfn-type=value data-export="" id=valuedef-auto>auto<a class=self-link href=#valuedef-auto></a></dfn> for <a class=property data-link-type=propdesc href=#propdef-align-self title=align-self>align-self</a>
17541754
computes to the value of <a class=property data-link-type=propdesc href=#propdef-align-items title=align-items>align-items</a> on the element’s parent,
1755-
&lt;&lt;&lt;&lt;&lt;&lt;&lt; local
1756-
or <a class=css-code data-link-for=align-self data-link-type=value href=#valuedef-stretch0 title=stretch>stretch</a> if the element has no parent.
1757-
=======
17581755
or <a class=css data-link-for=align-self data-link-type=maybe href=#valuedef-stretch0 title=stretch>stretch</a> if the element has no parent.
1759-
&gt;&gt;&gt;&gt;&gt;&gt;&gt; other
17601756
The alignments are defined as:
17611757

17621758
<dl data-dfn-for="align-items align-self" data-dfn-type=value>

0 commit comments

Comments
 (0)