mirror of
https://github.com/whoisclebs/lodash.git
synced 2026-02-11 19:37:49 +00:00
resolving merge
This commit is contained in:
@@ -23,6 +23,7 @@
|
|||||||
width: 200px;
|
width: 200px;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
|
-webkit-overflow-scrolling: touch;
|
||||||
padding: 15px 0 30px 30px;
|
padding: 15px 0 30px 30px;
|
||||||
border-right: 1px solid #bbb;
|
border-right: 1px solid #bbb;
|
||||||
box-shadow: 0 0 20px #ccc; -webkit-box-shadow: 0 0 20px #ccc; -moz-box-shadow: 0 0 20px #ccc;
|
box-shadow: 0 0 20px #ccc; -webkit-box-shadow: 0 0 20px #ccc; -moz-box-shadow: 0 0 20px #ccc;
|
||||||
@@ -1582,8 +1583,8 @@ _([1, 2, 3]).value();
|
|||||||
<b class="header">1.2.4</b> — <small><i>Jan. 4, 2012</i></small><br />
|
<b class="header">1.2.4</b> — <small><i>Jan. 4, 2012</i></small><br />
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
You now can (and probably should, as it's simpler)
|
You now can (and probably should, as it's simpler)
|
||||||
write <tt>_.chain(list)</tt>
|
write <tt>_.chain(list)</tt>
|
||||||
instead of <tt>_(list).chain()</tt>.
|
instead of <tt>_(list).chain()</tt>.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
|
|||||||
Reference in New Issue
Block a user