git merge nightmare

Author: NITRO5\Corey

CONTRIBUTORS

@@ -16,7 +16,6 @@ The following list of authors was automatically generated from the XChange proje
 
     git log --format='%aN' | sort -u
 
-小田謙太郎
 =
 Achterhoeker
 Adam from WALCZAK.IT
@@ -28,6 +27,7 @@ Alexey Z
 Allen Day
 Alvin Singh
 Andraž
+Andrea Fossi
 André Reiter
 Anthony Tsang
 Arthurm1
@@ -48,6 +48,7 @@ Chris Rico
 Christian Strässle
 Cray Imperative
 Cristian Lucaci
+Cyril
 Daniel Cohen
 Danilo Guimarães
 Dave Seyb
@@ -133,10 +134,13 @@ Mikelle
 Mikhail Wall
 Miso Oprendek
 Muffon
+Nathan King
 Nicolas Pinot
+Nikita Belenkiy
 Niko Schmuck
 Norbert Sándor
 ObsessiveOrange
+Oleg Danilov
 Oleg Khomenko
 Oliver Drotleff
 Oscar Francia
@@ -149,8 +153,8 @@ Peter N. Steinmetz
 Piotr Ladyzynski
 Piotr Ładyżyński
 Radu
-Rafał Krupiński
 Rafal Krupinski
+Rafał Krupiński
 Raphael Voellmy
 Richard Flint
 Robert Felker
@@ -163,10 +167,13 @@ Sebastiaan van Erk
 Sergey Belyakov
 Sergey Lukashevich
 Sergey Tselovalnikov
+Sergii Pogodin
 Sergio Rodriguez
 Sikerdebaard
+Snailz
 Stuart Low
 Sumedha Saxena
+Sylvain
 Sébastien Koch
 TM Lee
 The Gitter Badger
@@ -198,8 +205,11 @@ Zorge.R
 ahmetoz
 ajdev
 aleks-azen
+[email protected]
 alessandro luppi
 alobarev
+amjad1210
+anton
 anw
 apaygh
 artvel
@@ -210,6 +220,7 @@ bolobox
 boppleton
 brilliantnut
 bronko
+bronoman
 brox
 cacofish
 cacofishadct
@@ -233,10 +244,14 @@ gmorpheme
 godoorsun
 gpwclark
 hardsky
+hbwhyte
 henry
+huguanrui
 hurricup
+interwater
 ivan.kosianenko
 jamespedwards42
+jasonliu119
 jclaruelle
 jcuypers
 johndemic
@@ -255,8 +270,10 @@ mazi
 mdeverdelhan
 mfarid
 mharris021
+michaelscheung
 miho
 mnapier
+moardm
 nakedpony
 nicostouch
 nimrood
@@ -265,10 +282,12 @@ [email protected]
 o
 odaken
 paul
+pchertalev
 perlboy
 piotr
 pnkwpk
 pozheg
+procyon
 seanrobb
 sebastienkoch
 semihunaldi
@@ -283,12 +302,17 @@ stephane-coulomb
 stevenuray
 suchac
 swiesend
+taoruifu
 tbosman
 tim
 timmolter
+trix
+trix13
 veken0m
 vulicevic
 will
 wvr
 ww3456
 zholmes
+陈晔
+小田謙太郎

README.md

@@ -103,17 +103,17 @@ Add the following dependencies in your pom.xml file. You will need at least xcha
     <dependency>
       <groupId>org.knowm.xchange</groupId>
       <artifactId>xchange-core</artifactId>
-      <version>4.3.5</version>
+      <version>4.3.7</version>
     </dependency>
     <dependency>
       <groupId>org.knowm.xchange</groupId>
       <artifactId>xchange-examples</artifactId>
-      <version>4.3.5</version>
+      <version>4.3.7</version>
     </dependency>
     <dependency>
       <groupId>org.knowm.xchange</groupId>
       <artifactId>xchange-XYZ</artifactId>
-      <version>4.3.5</version>
+      <version>4.3.7</version>
     </dependency>
 
 For snapshots, add the following repository to your pom.xml file.
@@ -126,7 +126,7 @@ For snapshots, add the following repository to your pom.xml file.
 
 The current snapshot version is: 
 
-    4.3.6-SNAPSHOT
+    4.3.8-SNAPSHOT
 
 ## Building with Maven