From: Michael Lee Date: Mon, 8 Feb 2016 20:53:55 +0000 (-0800) Subject: Fix bad merge. X-Git-Tag: deprecate-dynamic-initializer~86 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=785485183fec26c5902cb035ff17bbe5f3fe6513;p=folly.git Fix bad merge. Summary: FBStringTest.cpp was refactored, but the TestUtil and TemporaryFile was not properly removed. Reviewed By: yfeldblum Differential Revision: D2913045 fb-gh-sync-id: 710c3f5b808acb634dfcd65219484ddc257ed52c --- diff --git a/folly/test/FBStringTest.cpp b/folly/test/FBStringTest.cpp index c3259142..629f0497 100644 --- a/folly/test/FBStringTest.cpp +++ b/folly/test/FBStringTest.cpp @@ -33,7 +33,6 @@ #include #include #include -#include using namespace std; using namespace folly;