phoenix/hostnames
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Resolve conflict

Browse source
This commit is contained in:
Felix Niederwanger 2021-08-02 09:43:00 +02:00
parent 69643b43ef d41aa0e7aa
commit 8887772ed6
Signed by: phoenix
GPG key ID: 31860289A704FB3C
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
astronames.txt
View file

@ -1,5 +1,6 @@
altair altair
andromeda andromeda
aqualia_rift
arcturus arcturus
aurora aurora
betelgeuze betelgeuze
@ -9,14 +10,19 @@ cassini
cassiopeia cassiopeia
castor castor
hale-bopp hale-bopp
hercules
hubble hubble
kepler kepler
luna luna
lyra lyra
lyrids lyrids
magellan magellan
monoceros
nebula nebula
pioneer pioneer
ophiuchi
orion
perseus
pollux pollux
quasar quasar
sagittarius sagittarius

17
skyrim.txt Normal file
View file

@ -0,0 +1,17 @@
alduin
dunehviir
fusrodah
krosulhah
kruziikrel
mirmulnir
naaslaarum
nahagliiv
odahviing
parathurnax
relonikiv
sahloknir
sahrotaar
viinturuth
voslaarum
vuljotnaak
vulthuryol