Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove git merge info from changelog #345

Merged
merged 1 commit into from
Nov 16, 2018
Merged

Remove git merge info from changelog #345

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@

<<<<<<< HEAD
=======
<a name="styx-styx-1.0.0.beta2"></a>
## [styx-styx-1.0.0.beta2](https://github.com/HotelsDotCom/styx/compare/styx-1.0.0.beta1...styx-styx-1.0.0.beta2) (2018-10-31)

Expand All @@ -18,7 +15,6 @@
* Upgrade to a newer version of fasterxml ([#318](https://github.com/HotelsDotCom/styx/issues/318))


>>>>>>> upstream/release-styx-styx-1.0.0.beta2
<a name="styx-1.0.0.beta1"></a>
## [styx-1.0.0.beta1](https://github.com/HotelsDotCom/styx/compare/styx-0.7.10...styx-1.0.0.beta1) (2018-10-26)

Expand Down