Fix semantic merge conflict (#107)

assetStringsEqualToBytes -> assertStringsEqualToBytes
palantir · Nov 25, 2019 · 0d18bd9 · 0d18bd9
1 parent 011fb38
commit 0d18bd9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...able-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java b/...able-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