cleaning up accidentally committed merge debris
This commit is contained in:
parent
e0caf6a151
commit
9a9e266ae0
@ -113,11 +113,7 @@ case $1 in
|
|||||||
dir) dirs;;
|
dir) dirs;;
|
||||||
doc) docs;;
|
doc) docs;;
|
||||||
docs) docs;;
|
docs) docs;;
|
||||||
<<<<<<< HEAD
|
|
||||||
s[ac]ss) sassfn;;
|
s[ac]ss) sassfn;;
|
||||||
=======
|
|
||||||
s[ac]ss) sass;;
|
|
||||||
>>>>>>> ee-dev
|
|
||||||
other) dirs; other;;
|
other) dirs; other;;
|
||||||
rest) other;;
|
rest) other;;
|
||||||
info) info;;
|
info) info;;
|
||||||
|
Loading…
Reference in New Issue
Block a user