lint

RiverFinancial · Feb 23, 2022 · f386227 · f386227
1 parent a85e9e5
commit f386227
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/test/script_test.exs b/test/script_test.exs
@@ -1125,16 +1125,13 @@ defmodule Bitcoinex.ScriptTest do
         end
       end
     end
-<<<<<<< HEAD
 
     test "test bip350 test vectors" do
       for t <- @bip350_test_vectors do
         {:ok, s} = Script.parse_script(t.hex)
         assert Script.to_address(s, t.net) == {:ok, t.b32}
       end
     end
-=======
->>>>>>> 7206ceb (add multisig capability & more testing)
   end
 
   describe "test from_address" do