diff options
| author |  Yong Tang <yong.tang.github@outlook.com> | 2018-08-08 19:40:28 +0000 |
|---|---|---|
| committer | Yong Tang <yong.tang.github@outlook.com> | 2018-08-08 19:40:28 +0000 |
| commit | 46d4c0f254b2e39b74723a026530c8c6cff4f867 (patch) | |
| tree | 5a4f04ea1eadac23a313a6f2dca2f614a6ce6fd5 /tensorflow/contrib/lite/python | |
| parent | 07ad8e36896f8c9a787b10927d76dacb9519e891 (diff) | |
Fix merge conflict.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Diffstat (limited to 'tensorflow/contrib/lite/python')
| -rw-r--r-- | tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.h b/tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.h index f83063627a..641dd93db5 100644 --- a/tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.h +++ b/tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.h @@ -15,8 +15,6 @@ limitations under the License. #ifndef TENSORFLOW_CONTRIB_LITE_PYTHON_INTERPRETER_WRAPPER_INTERPRETER_WRAPPER_H_ #define TENSORFLOW_CONTRIB_LITE_PYTHON_INTERPRETER_WRAPPER_INTERPRETER_WRAPPER_H_ -// Place `<locale>` before <Python.h> to avoid build failures in macOS. -#include <locale> #include <memory> #include <string> #include <vector> |