summaryrefslogtreecommitdiff
path: root/release-notes.md
diff options
context:
space:
mode:
Diffstat (limited to 'release-notes.md')
-rw-r--r--release-notes.md31
1 files changed, 0 insertions, 31 deletions
diff --git a/release-notes.md b/release-notes.md
index d6483330..5b102df3 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
# Release notes
## 2.0 (upcoming)
<!--See [log](https://github.com/Pathoschild/SMAPI/compare/1.10...2.0).-->
@@ -470,33 +469,3 @@ For SMAPI developers:
* 0.3 (2016-03-01, [log](https://github.com/Pathoschild/SMAPI/compare/Alpha0.2...0.3))
* 0.2 (2016-02-29, [log](https://github.com/Pathoschild/SMAPI/compare/Alpha0.1...Alpha0.2)
* 0.1 (2016-02-28)
-=======
-## Release notes
-### 1.6
-* Added support for deploying mod files into `Mods` automatically.
-* Added a build error if a game folder is found, but doesn't contain Stardew Valley or SMAPI.
-
-### 1.5
-* Added support for setting a custom game path globally.
-* Added default GOG path on Mac.
-
-### 1.4
-* Fixed detection of non-default game paths on 32-bit Windows.
-* Removed support for SilVerPLuM (discontinued).
-* Removed support for overriding the target platform (no longer needed since SMAPI crossplatforms mods automatically).
-
-### 1.3
-* Added support for non-default game paths on Windows.
-
-### 1.2
-* Exclude game binaries from mod build output.
-
-### 1.1
-* Added support for overriding the target platform.
-
-### 1.0
-* Initial release.
-* Added support for detecting the game path automatically.
-* Added support for injecting XNA/MonoGame references automatically based on the OS.
-* Added support for mod builders like SilVerPLuM.
->>>>>>> mod-build-config/develop