Resolved Conflicts

Author: jain-naman-sf

cumulusci/cli/cci.py

@@ -18,6 +18,7 @@
 from cumulusci.utils.http.requests_utils import init_requests_trust
 from cumulusci.utils.logging import tee_stdout_stderr
 
+from .checks import checks
 from .error import error
 from .flow import flow
 from .logger import get_tempfile_logger, init_logger
@@ -242,3 +243,4 @@ def shell(runtime, script=None, python=None):
 cli.add_command(flow)
 cli.add_command(plan)
 cli.add_command(robot)
+cli.add_command(checks)