add wild encounter documentation

docs/_sources/reference/CHANGELOG.md.txt

@@ -7,6 +7,7 @@ and this project somewhat adheres to [Semantic Versioning](https://semver.org/sp
 The **"Breaking Changes"** listed below are changes that have been made in the decompilation projects (e.g. pokeemerald), which porymap requires in order to work properly. If porymap is used on a project that is not up-to-date with the breaking changes, then porymap will likely break or behave improperly.
 
 ## [Unreleased]
+<<<<<<< 92cf37cff99088605032dedf0be919d08d2e2fad
 ### Added
 - Add warning when closing porymap with unsaved changes.
 
@@ -14,13 +15,22 @@ The **"Breaking Changes"** listed below are changes that have been made in the d
 - Exporting map images is now more configurable. Events, connections, collision, etc. can be toggled on and off before exporting the image.
 - The entire Tileset Editor selection is now conveniently flipped when selecting x-flip or y-flip.
 - Autocomplete for porymap's comboboxes are no longer requires typing the full string prefix.
+=======
+### Changed
+- Add wild encounter table editor.
+- Exporting map images is now more configurable. Events, connections, collision, etc. can be toggled on and off before exporting the image.
+- The entire Tileset Editor selection is now conveniently flipped when selecting x-flip or y-flip.
+>>>>>>> add wild encounter documentation
 
 ### Fixed
 - Fix bug where map group names were hardcoded when creating a new map.
 - Fix bug in Tileset Editor where multi-tile selections weren't properly painted when clicking on the bottom row of the metatile layers.
 - Fix bug where line breaks in C headers were not parsed properly.
+<<<<<<< 92cf37cff99088605032dedf0be919d08d2e2fad
 - Fix bug when exporting tileset images using palettes with duplicate colors.
 - Fix bug where creating new maps from existing layouts created an empty layout folder.
+=======
+>>>>>>> add wild encounter documentation
 
 
 ## [1.2.2] - 2019-05-16