Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

dd3e7e3f

Commit dd3e7e3f authored 6 years ago by Pregmodder

Downloads
- Plain Diff

conflict resolution

parents 04198b65 c67511c2

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

devNotes/twine JS.txt 3 additions, 0 deletions

devNotes/twine JS.txt
src/init/storyInit.tw 2 additions, 0 deletions

src/init/storyInit.tw
src/js/economyJS.tw 3 additions, 0 deletions

src/js/economyJS.tw
src/npc/fFeelings.tw 1 addition, 1 deletion

src/npc/fFeelings.tw
src/pregmod/manageEconomy.tw 14 additions, 0 deletions

src/pregmod/manageEconomy.tw
src/uncategorized/BackwardsCompatibility.tw 9 additions, 0 deletions

src/uncategorized/BackwardsCompatibility.tw
src/uncategorized/RESS.tw 15 additions, 13 deletions

src/uncategorized/RESS.tw
src/uncategorized/costsReport.tw 4 additions, 0 deletions

src/uncategorized/costsReport.tw
src/uncategorized/newSlaveIntro.tw 1 addition, 1 deletion

src/uncategorized/newSlaveIntro.tw
src/uncategorized/nextWeek.tw 2 additions, 2 deletions

src/uncategorized/nextWeek.tw
src/uncategorized/persBusiness.tw 31 additions, 0 deletions

src/uncategorized/persBusiness.tw

with 85 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment