summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorZoryn <zoryn4163@gmail.com>2016-03-03 15:06:25 -0500
committerZoryn <zoryn4163@gmail.com>2016-03-03 15:06:25 -0500
commit9a1b910ea32f518b605c88315f192afc6fc40f28 (patch)
treefcc475ef046295a06a2358c7f83cb4e97e38ce9c /.gitignore
parentde3f161a49bf7486290f0e4b3531177f949bc3cd (diff)
downloadSMAPI-9a1b910ea32f518b605c88315f192afc6fc40f28.tar.gz
SMAPI-9a1b910ea32f518b605c88315f192afc6fc40f28.tar.bz2
SMAPI-9a1b910ea32f518b605c88315f192afc6fc40f28.zip
resync for merge conflicts
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ab067b03..4737a5d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
StardewModdingAPI/bin/
StardewModdingAPI/obj/
packages/
-StardewInjector/
*.symlink
*.lnk