15k wallet update

hashplatform · Jan 16, 2019 · dc2c84a · dc2c84a
2 parents a6f8286 + 0fdd475
commit dc2c84a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -54,4 +54,8 @@ and Linux, OS X, and that unit and sanity tests are automatically run.
 Changes should be tested by somebody other than the developer who wrote the
 code. This is especially important for large or high-risk changes. It is useful
 to add a test plan to the pull request description if testing the changes is
-not straightforward.
+<<<<<<< HEAD
+not straightforward.
+=======
+not straightforward.# HASH
+>>>>>>> 0fdd4758573d9796c1bb4f42d37260e3d3211f81