Fix folly conversions for Clang with GCC5's libstdc++

[folly.git] / folly / test / MergeTest.cpp

diff --git a/folly/test/MergeTest.cpp b/folly/test/MergeTest.cpp
index 1e2a983fb13788c6bf3996750982911dc76fc438..880c5e981ea61c7b0e60de44dcdf37ff0faacf0b 100644 (file)
--- a/folly/test/MergeTest.cpp
+++ b/folly/test/MergeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Facebook, Inc.
+ * Copyright 2016 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.