Fix sanity issues.

diff --git a/tensorflow/tools/api/generator/BUILD b/tensorflow/tools/api/generator/BUILD
index 5a9eb44b3273534e18e5809f1d450e534110616b..f0c5877a90836eaba58ba5e3a49db822f324b3c5 100644 (file)
--- a/tensorflow/tools/api/generator/BUILD
+++ b/tensorflow/tools/api/generator/BUILD
@@ -24,4 +24,3 @@ py_test(
         "//tensorflow/python:client_testlib",
     ],
 )
-

diff --git a/tensorflow/tools/api/generator/create_python_api.py b/tensorflow/tools/api/generator/create_python_api.py
index 4f3ca06539231f3d71e4b1e298386e0df46d1b5d..9f210ad42b316929c40b9e03654ffcc710b3ed0b 100644 (file)
--- a/tensorflow/tools/api/generator/create_python_api.py
+++ b/tensorflow/tools/api/generator/create_python_api.py
@@ -296,18 +296,14 @@ def create_api_files(
       continue
     contents = ''
     if module or not root_init_template:
-      contents = _GENERATED_FILE_HEADER + text
+      contents = _GENERATED_FILE_HEADER + text + _GENERATED_FILE_FOOTER
     else:
       # Read base init file
       with open(root_init_template, 'r') as root_init_template_file:
         contents = root_init_template_file.read()
         contents = contents.replace('# API IMPORTS PLACEHOLDER', text)
     with open(module_name_to_file_path[module], 'w') as fp:
-<<<<<<< HEAD
-      fp.write(_GENERATED_FILE_HEADER + text + _GENERATED_FILE_FOOTER)
-=======
       fp.write(contents)
->>>>>>> 2e272dbca6600991599e55a7ff7cfa668b8403aa
 
   if missing_output_files:
     raise ValueError(