From 6f4da26453237c62d196cdce317b587ea61a8a0f Mon Sep 17 00:00:00 2001
From: "honfika@gmail.com" <honfika@gmail.com>
Date: Fri, 3 Jul 2015 20:48:23 +0200
Subject: [PATCH] merge fixes

---
 .../jpexs/decompiler/flash/action/Action.java    |  8 +-------
 .../ffdec_lib/src/com/jpexs/helpers/Helper.java  | 16 ----------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java
index 100126c3c..b74c72586 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java
@@ -74,9 +74,9 @@ import com.jpexs.decompiler.graph.model.CommentItem;
 import com.jpexs.decompiler.graph.model.IfItem;
 import com.jpexs.decompiler.graph.model.LocalData;
 import com.jpexs.decompiler.graph.model.NotItem;
-import com.jpexs.helpers.ByteArrayRange;
 import com.jpexs.decompiler.graph.model.PopItem;
 import com.jpexs.decompiler.graph.model.ScriptEndItem;
+import com.jpexs.helpers.ByteArrayRange;
 import com.jpexs.helpers.CancellableWorker;
 import com.jpexs.helpers.Helper;
 import java.io.ByteArrayOutputStream;
@@ -997,15 +997,9 @@ public abstract class Action implements GraphSourceItem {
              List<GraphTargetItem> tryCommands = ActionGraph.translateViaGraph(registerNames, variables, functions, atry.tryBody, version);
              ActionItem catchName;
              if (atry.catchInRegisterFlag) {
-             <<<<<<< HEAD
              catchName = new DirectValueActionItem(atry, -1, new RegisterNumber(atry.catchRegister), new ArrayList<>());
              } else {
              catchName = new DirectValueActionItem(atry, -1, atry.catchName, new ArrayList<>());
-             =======
-             catchName = new DirectValueActionItem(atry, -1, new RegisterNumber(atry.catchRegister), new ArrayList<String>());
-             } else {
-             catchName = new DirectValueActionItem(atry, -1, atry.catchName, new ArrayList<String>());
-             >>>>>>> v6
              }
              List<GraphTargetItem> catchExceptions = new ArrayList<GraphTargetItem>();
              catchExceptions.add(catchName);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java b/libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java
index b417ea5af..81e99c1b4 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java
@@ -143,13 +143,8 @@ public class Helper {
     }
 
     /**
-     * <<<<<<< HEAD
-     * Formats specified address to four numbers xxxx (or five numbers when
-     * showing decimal addresses)
-     * =======
      * Formats specified address to four numbers xxxx
      * (or five numbers when showing decimal addresses)
-     * >>>>>>> v6
      *
      * @param number Address to format
      * @return String representation of the address
@@ -159,13 +154,8 @@ public class Helper {
     }
 
     /**
-     * <<<<<<< HEAD
-     * Formats specified address to four numbers xxxx (or five numbers when
-     * showing decimal addresses)
-     * =======
      * Formats specified address to four numbers xxxx
      * (or five numbers when showing decimal addresses)
-     * >>>>>>> v6
      *
      * @param number Address to format
      * @param decimal Use decimal format
@@ -292,12 +282,7 @@ public class Helper {
      * character.</li>
      * </ul>
      *
-     * <<<<<<< HEAD
-     *
      * @param st A string optionally containing standard java escape sequences.
-     * =======
-     * @param st A string optionally containing standard java escape sequences.
-     * >>>>>>> v6
      * @return The translated string.
      */
     public static String unescapeJavaString(String st) {
@@ -1362,5 +1347,4 @@ public class Helper {
         }
         return data;
     }
-
 }