From beea13b22361f108d3c13256a27e38906bdb6a73 Mon Sep 17 00:00:00 2001
From: zilinzhu <zilinzhu@tencent.com>
Date: Tue, 31 Mar 2020 21:53:58 +0800
Subject: [PATCH] fix merge conflict

---
 tensorflow/python/autograph/converters/break_statements.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/autograph/converters/break_statements.py b/tensorflow/python/autograph/converters/break_statements.py
index cce0f1c91ee..635b1804593 100644
--- a/tensorflow/python/autograph/converters/break_statements.py
+++ b/tensorflow/python/autograph/converters/break_statements.py
@@ -144,7 +144,7 @@ class BreakTransformer(converter.Base):
           orelse=node.orelse)
 
       new_for_node = node[0]
-      anno.copyanno(original_node, new_for_node, 'extra_test')
+      anno.copyanno(original_node, new_for_node, anno.Basic.EXTRA_LOOP_TEST)
       anno.copyanno(original_node, new_for_node, anno.Basic.DIRECTIVES)
 
       return node
@@ -175,7 +175,7 @@ class BreakTransformer(converter.Base):
         orelse=guarded_orelse)
 
     new_for_node = node[1]
-    anno.setanno(new_for_node, 'extra_test', extra_test)
+    anno.setanno(new_for_node, anno.Basic.EXTRA_LOOP_TEST, extra_test)
     anno.copyanno(original_node, new_for_node, anno.Basic.DIRECTIVES)
 
     return node