[geode-native] branch develop updated: GEODE-5753: Fixes rebase error

[jbarrett]

This is an automated email from the ASF dual-hosted git repository.

jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git


The following commit(s) were added to refs/heads/develop by this push:
     new 0806074  GEODE-5753: Fixes rebase error
0806074 is described below

commit 080607499c2bbd1d0a428a2a8a0452f132169179
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Mon Oct 8 12:51:41 2018 -0700

    GEODE-5753: Fixes rebase error
---
 tests/cpp/fwklib/FwkLog.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/cpp/fwklib/FwkLog.cpp b/tests/cpp/fwklib/FwkLog.cpp
index a76e8c2..170a75c 100644
--- a/tests/cpp/fwklib/FwkLog.cpp
+++ b/tests/cpp/fwklib/FwkLog.cpp
@@ -20,7 +20,6 @@
 #include <geode/Exception.hpp>
 
 #include "fwklib/FwkLog.hpp"
-#include "fwklib/PerfFwk.hpp"
 #include "hacks/AceThreadId.h"
 
 namespace apache {