diff options
| author | Shobhit Adlakha <adlakhashobhit@gmail.com> | 2019-07-22 09:52:37 -0400 |
|---|---|---|
| committer | Shobhit Adlakha <adlakhashobhit@gmail.com> | 2019-07-22 09:52:37 -0400 |
| commit | a72e667bfc1df405ea9f8360e6b38c25323002f4 (patch) | |
| tree | 70508453e876113454815af258390fe46dec1744 /src/components/formatters/test/CSmartFactory_test.cc | |
| parent | 4c148aafa5a21ee11f69af75e37afbf961a8766d (diff) | |
| parent | 5e6ea2c18e35b56a3109a0a5c1bb962b9445a094 (diff) | |
| download | sdl_core-a72e667bfc1df405ea9f8360e6b38c25323002f4.tar.gz | |
Fixed merge conflicts and updated branch
Diffstat (limited to 'src/components/formatters/test/CSmartFactory_test.cc')
| -rw-r--r-- | src/components/formatters/test/CSmartFactory_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/formatters/test/CSmartFactory_test.cc b/src/components/formatters/test/CSmartFactory_test.cc index 3aba109e58..5bd212f431 100644 --- a/src/components/formatters/test/CSmartFactory_test.cc +++ b/src/components/formatters/test/CSmartFactory_test.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "formatters/SmartFactoryTestHelper.h" #include "formatters/CSmartFactory.h" +#include "formatters/SmartFactoryTestHelper.h" #include "gtest/gtest.h" namespace test { |