From 436fe057565a23ab8736a8e6bb59dc78b8aaffa2 Mon Sep 17 00:00:00 2001
From: de4dot <de4dot@gmail.com>
Date: Thu, 29 Oct 2015 21:36:27 +0100
Subject: [PATCH] Fix some older merges

---
 .gitignore                                     | 18 ++++++++----------
 .../CryptoObfuscator/ResourceDecrypter.cs      |  3 +--
 .../deobfuscators/Unknown/Deobfuscator.cs      |  2 --
 .../renamer/asmmodules/GenericParamDef.cs      |  3 +--
 de4dot.cui/Program.cs                          |  1 -
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index a59d299c..daa78c41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,8 @@
-*~
-*/obj/
-*.csproj.user
-*.sdf
-*.opensdf
-*.suo
-/Debug/
-/Release/
-/deobfuscator.*/
-!/deobfuscator.Template/
+*~
+*/obj/
+*.csproj.user
+*.sdf
+*.opensdf
+*.suo
+/Debug/
+/Release/
diff --git a/de4dot.code/deobfuscators/CryptoObfuscator/ResourceDecrypter.cs b/de4dot.code/deobfuscators/CryptoObfuscator/ResourceDecrypter.cs
index 171820f4..d8a68d4e 100644
--- a/de4dot.code/deobfuscators/CryptoObfuscator/ResourceDecrypter.cs
+++ b/de4dot.code/deobfuscators/CryptoObfuscator/ResourceDecrypter.cs
@@ -322,8 +322,7 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
 			int sourceStreamOffset = 1;
 			bool didSomething = false;
 
-			if (skipBeforeFlag)
-			{
+			if (skipBeforeFlag) {
 				sourceStream.Position += skipBytes;
 				sourceStreamOffset += skipBytes;
 			}
diff --git a/de4dot.code/deobfuscators/Unknown/Deobfuscator.cs b/de4dot.code/deobfuscators/Unknown/Deobfuscator.cs
index 44dd0a26..8fc4fee0 100644
--- a/de4dot.code/deobfuscators/Unknown/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/Unknown/Deobfuscator.cs
@@ -86,8 +86,6 @@ namespace de4dot.code.deobfuscators.Unknown {
 		string ScanTypes() {
 			foreach (var type in module.Types) {
 				var fn = type.FullName;
-				if (fn == "ConfusedByAttribute")
-					return "Confuser";
 				if (fn == "ZYXDNGuarder")
 					return "DNGuard HVM";
 				if (type.Name.String.Contains("();\t"))
diff --git a/de4dot.code/renamer/asmmodules/GenericParamDef.cs b/de4dot.code/renamer/asmmodules/GenericParamDef.cs
index 04b72536..f2ccb880 100644
--- a/de4dot.code/renamer/asmmodules/GenericParamDef.cs
+++ b/de4dot.code/renamer/asmmodules/GenericParamDef.cs
@@ -21,8 +21,7 @@ using System.Collections.Generic;
 using dnlib.DotNet;
 
 namespace de4dot.code.renamer.asmmodules {
-	public class MGenericParamDef : Ref
-    {
+	public class MGenericParamDef : Ref {
 		public GenericParam GenericParam {
 			get { return (GenericParam)memberRef; }
 		}
diff --git a/de4dot.cui/Program.cs b/de4dot.cui/Program.cs
index ad2bdb47..c4bdfbd9 100644
--- a/de4dot.cui/Program.cs
+++ b/de4dot.cui/Program.cs
@@ -109,7 +109,6 @@ namespace de4dot.cui {
 				Logger.n("");
 				Logger.n("de4dot v{0} Copyright (C) 2011-2014 de4dot@gmail.com", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
 				Logger.n("Latest version and source code: https://github.com/0xd4d/de4dot");
-				Logger.n("{0} deobfuscator modules loaded!", deobfuscatorInfos.Count);
 				Logger.n("");
 
 				var options = new FilesDeobfuscator.Options();