Merge branch 'ee-dev'
This commit is contained in:
commit
b9521b541c
@ -34,3 +34,6 @@ A shining beacon of hope and industry with dreams of their own identity.
|
|||||||
|
|
||||||
> Good work, team. That's enough for today. Can't believe we've come so far.
|
> Good work, team. That's enough for today. Can't believe we've come so far.
|
||||||
|
|
||||||
|
The most inhospitable colonised planet, Saturn's entire population consists mainly of miners and researchers,
|
||||||
|
with a notable exception being a single sports stadium.
|
||||||
|
|
||||||
|
@ -45,3 +45,6 @@ Martian Spanish is notable for having a neuter case ("-e") for any animate noun.
|
|||||||
- Syane :: (Corrupted from Spanish, Marciano), Martian native.
|
- Syane :: (Corrupted from Spanish, Marciano), Martian native.
|
||||||
* Other
|
* Other
|
||||||
- Homebound :: n. Someone from Earth.
|
- Homebound :: n. Someone from Earth.
|
||||||
|
- Delve :: n. A generic term for Direct Neural Interface VR, derived from a genericised trademark.
|
||||||
|
- Delve :: v. To use a delver
|
||||||
|
- Delver :: n. A device that uses the Delve technology.
|
||||||
|
@ -113,7 +113,11 @@ 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