From 4e3433f2b7d98f081ce9a7da3e71943a63e9e3da Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@digia.com>
Date: Mon, 14 Jan 2013 16:10:56 +0100
Subject: [PATCH] Remove broken result of an automatic merge resolution.

Change-Id: Idc86a0cc2175c11e5b40f9c28e294bd0a7d033eb
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 qv4mm.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qv4mm.h b/qv4mm.h
index 10b64c5..33ffc88 100644
--- a/qv4mm.h
+++ b/qv4mm.h
@@ -91,7 +91,6 @@ public:
 
     void setEnableGC(bool enableGC);
     void setExecutionEngine(ExecutionEngine *engine);
-    void setStringPool(StringPool *stringPool);
 
     void dumpStats() const;
 
-- 
2.7.4