合并冲突

src/main/java/com/brilliace/swifteditor/tag/message/MessageAnalyzer.java

@@ -772,7 +772,6 @@ public class MessageAnalyzer {
 			e.printStackTrace();
 		}
 		return null;
-<<<<<<< HEAD
 	  }
 	  public static void main(String[] args)
 	  {
@@ -789,24 +788,4 @@ public class MessageAnalyzer {
 		  //System.out.println(value.matches(TagFormat.TagMap.get("79").toAnalyzeReg()));
 	  }
 	  
-=======
-	}
-
-	public static void main(String[] args) {
-		// SWFMessage swf = MessageFormat.getSWFMessage("202COV");
-		// System.out.println(swf.toFormatJSON());
-		// MessageFormat.loadSWFMessage();
-		String path = "d:/black/103.sf2";
-		String msg = readFull(path);
-
-		SWFMessage swf = loadSwiftMessage(msg);
-		System.out.println("swiftType=" + swf.getMtType());
-		List<LinkedTreeMap> list = new Gson().fromJson(swf.toFormatJSON(), List.class);
-		// System.out.println(list);
-		// System.out.print(swf.toJSON());
-		for (LinkedTreeMap map : list) {
-			System.out.println(map.get("tag") + "...." + map.get("tagValue"));
-		}
-	}
->>>>>>> 9f1e374811c69ecece4e29dc2a1ddb7bdc7c6538
 }