fix linter

Author: ayrat555

apps/omg_eth/lib/omg_eth/root_chain/abi_event_selector.ex

@@ -64,19 +64,6 @@ defmodule OMG.Eth.RootChain.AbiEventSelector do
     }
   end
 
-  @spec in_flight_exit_deleted() :: ABI.FunctionSelector.t()
-  def in_flight_exit_deleted() do
-    %ABI.FunctionSelector{
-      function: "InFlightExitDeleted",
-      input_names: ["exitId"],
-      inputs_indexed: [true],
-      method_id: <<25, 145, 196, 195>>,
-      returns: [],
-      type: :event,
-      types: [uint: 160]
-    }
-  end
-
   @spec in_flight_exit_challenged() :: ABI.FunctionSelector.t()
   def in_flight_exit_challenged() do
     %ABI.FunctionSelector{

priv/perf/apps/load_test/lib/scenario/start_standard_exit.ex

@@ -12,19 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD:apps/omg_utils/test/omg_utils/app_version_tet.exs
-defmodule OMG.Utils.AppVersionTest do
-  use ExUnit.Case, async: true
-
-  alias OMG.Utils.AppVersion
-
-  describe "version/1" do
-    test "returns a compliant semver when given an application" do
-      # Using :elixir as the app because it is certain to be running during the test
-      version = AppVersion.version(:elixir)
-      assert {:ok, _} = Version.parse(version)
-    end
-=======
 defmodule LoadTest.Scenario.StartStandardExit do
   @moduledoc """
   Starts a standard exit.
@@ -50,6 +37,5 @@ defmodule LoadTest.Scenario.StartStandardExit do
       |> Exit.start_exit(exiter, gas_price)
 
     Session.assign(session, tx_hash: tx_hash)
->>>>>>> origin/master:priv/perf/apps/load_test/lib/scenario/start_standard_exit.ex
   end
 end