From a18c406cf0c08e5cf32ac3dfec5d329e33614ea7 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Sun, 14 Aug 2016 14:56:44 +0200
Subject: [PATCH] fixed ConflictResolver

---
 .../org/cryptomator/filesystem/crypto/ConflictResolver.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java
index 25b85e4dc..138ec226f 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java
@@ -87,7 +87,7 @@ final class ConflictResolver {
 				ByteBuffer beginOfFile2 = ByteBuffer.allocate(sampleSize);
 				int bytesRead1 = r1.read(beginOfFile1);
 				int bytesRead2 = r2.read(beginOfFile2);
-				if (bytesRead1 == sampleSize && bytesRead2 == sampleSize) {
+				if (bytesRead1 == bytesRead2) {
 					beginOfFile1.flip();
 					beginOfFile2.flip();
 					return beginOfFile1.equals(beginOfFile2);