Fix utils/gyb_syntax_support/AttributeNodes.py conflicts.

Author: dan-zheng

utils/gyb_syntax_support/AttributeNodes.py

@@ -64,17 +64,12 @@
                              kind='ImplementsAttributeArguments'),
                        Child('DifferentiableArguments',
                              kind='DifferentiableAttributeArguments'),
-<<<<<<< HEAD
-                       # SWIFT_ENABLE_TENSORFLOW
                        Child('DerivativeRegistrationArguments',
                              kind='DerivativeRegistrationAttributeArguments'),
+                       # SWIFT_ENABLE_TENSORFLOW
                        Child('DeprecatedDerivativeRegistrationArguments',
                              kind='DeprecatedDerivativeRegistrationAttributeArguments'),
                        # SWIFT_ENABLE_TENSORFLOW END
-=======
-                       Child('DerivativeArguments',
-                             kind='DerivativeRegistrationAttributeArguments'),
->>>>>>> upstream_20191216
                        Child('NamedAttributeString',
                              kind='NamedAttributeStringArgument'),
                    ], description='''
@@ -306,7 +301,6 @@
              Child('TrailingComma', kind='CommaToken', is_optional=True),
          ]),
 
-<<<<<<< HEAD
     # An optionally qualified declaration name.
     # qualified-decl-name ->
     #     base-type? '.'? (identifier | operator) decl-name-arguments?
@@ -344,16 +338,18 @@
                    The argument labels of the referenced function, optionally
                    specified.
                    '''),
-=======
+         ]),
+
     # The argument of the derivative registration attribute
-    # '@derivative(of: ...)'.
+    # '@derivative(of: ...)' and the transpose registration attribute
+    # '@transpose(of: ...)'.
     # derivative-registration-attr-arguments ->
     #     'of' ':' func-decl-name ','? differentiation-params-clause?
     Node('DerivativeRegistrationAttributeArguments', kind='Syntax',
          description='''
-         The arguments for the '@derivative(of:)' attribute: the 'of:' label,
-         the original declaration name, and an optional differentiation
-         parameter list.
+         The arguments for the '@derivative(of:)' and '@transpose(of:)'
+         attributes: the 'of:' label, the original declaration name, and an
+         optional differentiation parameter list.
          ''',
          children=[
              Child('OfLabel', kind='IdentifierToken', text_choices=['of'],
@@ -367,7 +363,6 @@
              Child('Comma', kind='CommaToken', is_optional=True),
              Child('DiffParams', kind='DifferentiationParamsClause',
                    is_optional=True),
->>>>>>> upstream_20191216
          ]),
 
     # func-decl-name -> (identifier | operator) decl-name-arguments?
@@ -392,34 +387,6 @@
                    '''),
          ]),
 
-    # SWIFT_ENABLE_TENSORFLOW
-    # The argument of the derivative registration attribute
-    # '@derivative(of: ...)' and the transpose registration attribute
-    # '@transpose(of: ...)'.
-    # derivative-registration-attr-arguments ->
-    #     'of' ':' func-decl-name ','? differentiation-params-clause?
-    # TODO(TF-1009): Add syntax support for dot-separated qualified names in
-    # `@transpose(of:)` attributes.
-    Node('DerivativeRegistrationAttributeArguments', kind='Syntax',
-         description='''
-         The arguments for the '@derivative(of:)' and '@transpose(of:)'
-         attributes: the 'of:' label, the original declaration name, and an
-         optional differentiation parameter list.
-         ''',
-         children=[
-             Child('OfLabel', kind='IdentifierToken', text_choices=['of'],
-                   description='The "of" label.'),
-             Child('Colon', kind='ColonToken', description='''
-                   The colon separating the "of" label and the original
-                   declaration name.
-                   '''),
-             Child('OriginalDeclName', kind='QualifiedDeclName',
-                   description='The referenced original declaration name.'),
-             Child('Comma', kind='CommaToken', is_optional=True),
-             Child('DiffParams', kind='DifferentiationParamsClause',
-                   is_optional=True),
-         ]),
-
     # SWIFT_ENABLE_TENSORFLOW
     # The argument of the deprecated derivative registration attribute
     # '@differentiating'.
@@ -438,4 +405,5 @@
              Child('DiffParams', kind='DifferentiationParamsClause',
                    is_optional=True),
          ]),
+    # SWIFT_ENABLE_TENSORFLOW END
 ]