From 6c8d246af91e1f0e0daa22b5f511ea0acbd40cf0 Mon Sep 17 00:00:00 2001
From: William Ballenthin <william.ballenthin@fireeye.com>
Date: Mon, 8 Nov 2021 14:31:43 -0700
Subject: [PATCH] fix bad merge

---
 capa/features/common.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/capa/features/common.py b/capa/features/common.py
index 75ed12ba..3a4e71e9 100644
--- a/capa/features/common.py
+++ b/capa/features/common.py
@@ -146,13 +146,9 @@ class Feature:
     def __repr__(self):
         return str(self)
 
-<<<<<<< HEAD
-    def evaluate(self, ctx: Dict["Feature", Set[int]]) -> "Result":
+    def evaluate(self, ctx: Dict["Feature", Set[int]]) -> Result:
         capa.perf.counters["evaluate.feature"] += 1
         capa.perf.counters["evaluate.feature." + self.name] += 1
-=======
-    def evaluate(self, ctx: Dict["Feature", Set[int]]) -> Result:
->>>>>>> master
         return Result(self in ctx, self, [], locations=ctx.get(self, []))
 
     def freeze_serialize(self):