minor code fixes

JuliaLang · Sep 29, 2017 · bf2864e · bf2864e
1 parent 4dc4d5b
commit bf2864e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/test/strings/basic.jl b/test/strings/basic.jl
@@ -132,7 +132,6 @@ end
 end
 
 @testset "issue #22500 (using `get()` to index strings with default returns)" begin
-
     utf8_str = "我很喜欢Julia"
 
     # Test that we can index in at valid locations

diff --git a/test/strings/util.jl b/test/strings/util.jl
@@ -239,7 +239,6 @@ end
     @test isa(chop("foo"), SubString)
 end
 
-<<<<<<< 5da628fa48bc75a66e6b5fc2fc1982a8994ad823
 @testset "bytes2hex and hex2bytes" begin
     hex_str = "d7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592"
     bin_val = hex2bytes(hex_str)
-Original file line number
+Diff line change
@@ Expand Up / @@ -132,7 +132,6 @@ end @@
     end
     @testset "issue #22500 (using `get()` to index strings with default returns)" begin
         utf8_str = "我很喜欢Julia"
         # Test that we can index in at valid locations
@@ Expand Down @@