Merge branch 'MemoImplementation' of ssh://bitbucket.org/bilthon/fullerene into MemoImplementation

2016-12-05 20:51:02 -05:00 · 2016-12-05 20:51:02 -05:00 · 78b9d322b9
parent 677c1d83f5 9d4ca57823
commit 78b9d322b9
2 changed files with 4 additions and 1 deletions
--- a/src/main/java/com/luminiasoft/bitshares/Util.java
+++ b/src/main/java/com/luminiasoft/bitshares/Util.java
@ -11,7 +11,10 @@ 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;