Solve problem with last commit

malware/Miscelanea.yar

@@ -1143,7 +1143,7 @@ rule DownExecute_A
     condition:
         all of ($winver*) or any of ($pdb*) or any of ($magic*) or 2 of ($str*)
 }
-=======
+
 rule CN_Toolset__XScanLib_XScanLib_XScanLib {
 	meta:
 		description = "Detects a Chinese hacktool from a disclosed toolset - from files XScanLib.dll, XScanLib.dll, XScanLib.dll"
@@ -1230,5 +1230,3 @@ rule CVE_2015_1674_CNGSYS {
 	condition:
 		uint16(0) == 0x5a4d and filesize < 60KB and all of them
 }
\ No newline at end of file
-
->>>>>>> pr/23