From 0d18bd9693e3aab3d5b7943336e3ff1ac58dfe11 Mon Sep 17 00:00:00 2001
From: Carter Kozak <ckozak@ckozak.net>
Date: Mon, 25 Nov 2019 08:35:32 -0500
Subject: [PATCH] Fix semantic merge conflict (#107)

assetStringsEqualToBytes -> assertStringsEqualToBytes
---
 .../humanreadabletypes/HumanReadableByteCountTests.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java b/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java
index 145e4d30..a5245019 100644
--- a/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java
+++ b/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java
@@ -47,7 +47,7 @@ public void testParseMibiBytes() {
 
     @Test
     public void testParseMebiBytes() {
-        assetStringsEqualToBytes((long) Math.pow(1024L, 2L) * 10L, "10m", "10mb", "10 mebibyte", "10 mebibytes");
+        assertStringsEqualToBytes((long) Math.pow(1024L, 2L) * 10L, "10m", "10mb", "10 mebibyte", "10 mebibytes");
     }
 
     @Test