Remove merge conflict marker from failed merge resolution

2020-09-19 18:57:03 -07:00 · 2020-09-19 18:57:03 -07:00 · 0fde760d7e
commit 0fde760d7e
parent b98674e737
1 changed files with 0 additions and 1 deletions
--- a/tensorflow/lite/kernels/kernel_util.h
+++ b/tensorflow/lite/kernels/kernel_util.h
@ -46,7 +46,6 @@ inline TfLiteTensor* GetVariableInput(TfLiteContext* context,
    return nullptr;
  }
  TfLiteTensor* tensor = &context->tensors[tensor_index];
->>>>>>> d8f8236c29 ([tflite] Test for `kTfLiteOptionalTensor` in `GetInput`.)
  return (tensor->is_variable) ? tensor : nullptr;
 }
 inline TfLiteTensor* GetOutput(TfLiteContext* context, const TfLiteNode* node,