diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-28 12:45:55 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-28 12:45:55 -0700 |
| commit | c5ff781091db0cf6df282d0768102a2ea17d7e24 (patch) | |
| tree | 94c9020d2c5e33caa0aa7ae5b511d5da8f450eec /test/cpp/util/test_config.cc | |
| parent | c757f34dc30d0f414037c0de38334a819ce9b5b5 (diff) | |
| parent | 3bd96959398d0671fee3785d4b2aee6042649b15 (diff) | |
Merge branch 'idempotent' into ignore_connectivity
Diffstat (limited to 'test/cpp/util/test_config.cc')
| -rw-r--r-- | test/cpp/util/test_config.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/util/test_config.cc b/test/cpp/util/test_config.cc index e74f8fb14f..c446ae55c7 100644 --- a/test/cpp/util/test_config.cc +++ b/test/cpp/util/test_config.cc @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,8 +31,8 @@ * */ -#include <gflags/gflags.h> #include "test/cpp/util/test_config.h" +#include <gflags/gflags.h> // In some distros, gflags is in the namespace google, and in some others, // in gflags. This hack is enabling us to find both. |