Fix left behind conflict

cylc · Jun 5, 2019 · c09601d · c09601d
1 parent c95da46
commit c09601d
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/cylc/flow/config.py b/cylc/flow/config.py
@@ -240,22 +240,10 @@ def __init__(
                 fcp = self.cfg['scheduling'].get('final cycle point')
                 if just_has_async_graph and not (
                         icp in [None, "1"] and fcp in [None, icp]):
-<<<<<<< HEAD:cylc/flow/config.py
                     raise SuiteConfigError(
                         'Conflicting syntax: integer vs ' +
                         'cycling suite: ' +
                         'are you missing a [dependencies][[[R1]]] section?')
-=======
-                    msg = (
-                        'Conflicting syntax: integer vs cycling suite:'
-                        '\n* Are you missing a [dependencies][R1] section?')
-                    if icp_str:
-                        msg += (
-                            '\n* Did you mean to provide "%s" as the initial '
-                            'cycle point?' % icp_str)
-                    raise SuiteConfigError(msg)
-
->>>>>>> bf185c145... Store remaining suite parameters for restart:lib/cylc/config.py
                 if just_has_async_graph:
                     # There aren't any other graphs, so set integer cycling.
                     self.cfg['scheduling']['cycling mode'] = (