Fix some older merges

.gitignore

@@ -6,5 +6,3 @@
 *.suo
 /Debug/
 /Release/
-/deobfuscator.*/
-!/deobfuscator.Template/

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;
 			}

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"))

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; }
 		}

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();