Skip to content

Commit 3bc2388

Browse files
committedSep 17, 2024·
More conflict resolution
1 parent be9513d commit 3bc2388

7 files changed

+2
-2
lines changed
 

‎copyright.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Copyright: ELG21 (https://pixabay.com/users/elg21-3764790/)
123123
License: Pixabay Copyright License
124124

125125
Files:
126-
images/land/city26*
126+
images/land/city29*
127127
Copyright: Pexels (https://pixabay.com/users/pexels-2286921/)
128128
License: Pixabay Copyright License
129129

‎data/map.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ system Almanhaq
701701

702702
planet Baitoon
703703
attributes homeworld jibauni
704-
landscape land/city26
704+
landscape land/city29
705705
description `This is where the Jibauni started, and presumably where the seat of the Normal Jibauni government is. Many Jibauni are moving about in the long, narrow passageways between the landing pads, many of which are old and cracked.`
706706
spaceport `This is the oldest existing spaceport in Jibauni space, and has many different sizes of hangars and pads to compensate for the large amounts of traffic this planet gets, because it is the third tourist destination in all of Jibauni space. All the buildings here are also old, and many of them are small and close together.`
707707
government Jibauni
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)
Please sign in to comment.