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/policy/policy_external/test/include/policy/mock_pt_ext_representation.h | |
| parent | 4c148aafa5a21ee11f69af75e37afbf961a8766d (diff) | |
| parent | 5e6ea2c18e35b56a3109a0a5c1bb962b9445a094 (diff) | |
| download | sdl_core-a72e667bfc1df405ea9f8360e6b38c25323002f4.tar.gz | |
Fixed merge conflicts and updated branch
Diffstat (limited to 'src/components/policy/policy_external/test/include/policy/mock_pt_ext_representation.h')
| -rw-r--r-- | src/components/policy/policy_external/test/include/policy/mock_pt_ext_representation.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/policy/policy_external/test/include/policy/mock_pt_ext_representation.h b/src/components/policy/policy_external/test/include/policy/mock_pt_ext_representation.h index 3225e79e01..b307270b10 100644 --- a/src/components/policy/policy_external/test/include/policy/mock_pt_ext_representation.h +++ b/src/components/policy/policy_external/test/include/policy/mock_pt_ext_representation.h @@ -37,10 +37,10 @@ #include "gmock/gmock.h" +#include "mock_pt_representation.h" +#include "policy/policy_table/types.h" #include "policy/pt_ext_representation.h" #include "rpc_base/rpc_base.h" -#include "policy/policy_table/types.h" -#include "mock_pt_representation.h" namespace policy_table = ::rpc::policy_table_interface_base; |