From cf5900d586090518c6f9828b8e6cdbbe6899b2ac Mon Sep 17 00:00:00 2001
From: "Nelson R. Perez" <bilthon@gmail.com>
Date: Mon, 5 Dec 2016 20:52:26 -0500
Subject: [PATCH] Fixing lefotver from conflicts

---
 src/main/java/com/luminiasoft/bitshares/Util.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/com/luminiasoft/bitshares/Util.java b/src/main/java/com/luminiasoft/bitshares/Util.java
index 2eb7a69..1c67072 100644
--- a/src/main/java/com/luminiasoft/bitshares/Util.java
+++ b/src/main/java/com/luminiasoft/bitshares/Util.java
@@ -1,7 +1,6 @@
 package com.luminiasoft.bitshares;
 
 import org.tukaani.xz.FinishableOutputStream;
-import com.google.common.primitives.Bytes;
 import org.tukaani.xz.LZMA2Options;
 import org.tukaani.xz.LZMAInputStream;
 import org.tukaani.xz.LZMAOutputStream;
@@ -11,10 +10,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-<<<<<<< HEAD
 import java.nio.ByteBuffer;
-=======
->>>>>>> 9d4ca57823604965fa940c07c0752249d701cd59
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;