From dc97f364416c2a71e5d0684ca5ed3f28c63760ae Mon Sep 17 00:00:00 2001
From: Synapticloop <osmanj@15-Inches-of-Fun-2.local>
Date: Mon, 7 Mar 2016 15:17:06 +0000
Subject: [PATCH] merged conflicts

---
 README.md    | 10 +++++-----
 build.gradle |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 44af59c..abcac56 100644
--- a/README.md
+++ b/README.md
@@ -226,7 +226,7 @@ And now for the dependency
 <dependency>
 	<groupId>synapticloop</groupId>
 	<artifactId>backblaze-b2-java-api</artifactId>
-	<version>v1.2.2</version>
+	<version>v1.2.3</version>
 	<type>jar</type>
 </dependency>
 ```
@@ -256,9 +256,9 @@ and then include the dependency:
 
 ```
 dependencies {
-	runtime(group: 'synapticloop', name: 'backblaze-b2-java-api', version: 'v1.2.2', ext: 'jar')
+	runtime(group: 'synapticloop', name: 'backblaze-b2-java-api', version: 'v1.2.3', ext: 'jar')
 
-	compile(group: 'synapticloop', name: 'backblaze-b2-java-api', version: 'v1.2.2', ext: 'jar')
+	compile(group: 'synapticloop', name: 'backblaze-b2-java-api', version: 'v1.2.3', ext: 'jar')
 }
 ```
 
@@ -266,9 +266,9 @@ or, more simply for versions of gradle greater than 2.4
 
 ```
 dependencies {
-	runtime 'synapticloop:backblaze-b2-java-api:v1.2.2'
+	runtime 'synapticloop:backblaze-b2-java-api:v1.2.3'
 
-	compile 'synapticloop:backblaze-b2-java-api:v1.2.2'
+	compile 'synapticloop:backblaze-b2-java-api:v1.2.3'
 }
 ```
 
diff --git a/build.gradle b/build.gradle
index 7a63132..2057a03 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ group = 'synapticloop'
 archivesBaseName = 'backblaze-b2-java-api'
 description = """A java api for the truly excellent backblaze b2 storage service"""
 
-version = 'v1.2.2'
+version = 'v1.2.3'
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7