message: rush and oclif file changes
diff: @@ -48,7 +48,11 @@ USAGE
  OPTIONS
  -h, --help show CLI help
  +<<<<<<< HEAD
  --config=config [default: /Users/bergundy/.shiftjs/shiftjs.config.yml]
  +=======
  + --config=config [default: /Users/ariels/.shiftjs/shiftjs.config.yml]
  +>>>>>>> rush and oclif file changes
  EXAMPLE
  $ shift-cli browse
  @@ -69,7 +73,11 @@ ARGUMENTS
  OPTIONS
  -h, --help show CLI help
  +<<<<<<< HEAD
  --config=config [default: /Users/bergundy/.shiftjs/shiftjs.config.yml]
  +=======
  + --config=config [default: /Users/ariels/.shiftjs/shiftjs.config.yml]
  +>>>>>>> rush and oclif file changes
  EXAMPLE
  $ shift-cli claim OiJIUzI1NiIsIn
  @@ -87,7 +95,11 @@ USAGE
  OPTIONS
  -h, --help show CLI help
  +<<<<<<< HEAD
  --config=config [default: /Users/bergundy/.shiftjs/shiftjs.config.yml]
  +=======
  + --config=config [default: /Users/ariels/.shiftjs/shiftjs.config.yml]
  +>>>>>>> rush and oclif file changes
  EXAMPLE
  $ shift-cli deploy
  @@ -105,7 +117,11 @@ USAGE
  OPTIONS
  -h, --help show CLI help
  +<<<<<<< HEAD
  --config=config [default: /Users/bergundy/.shiftjs/shiftjs.config.yml]
  +=======
  + --config=config [default: /Users/ariels/.shiftjs/shiftjs.config.yml]
  +>>>>>>> rush and oclif file changes
  --id=id Application id (defaults to working directory's deployed application ID)
  EXAMPLE
  @@ -142,7 +158,11 @@ USAGE
  OPTIONS
  -f, --format=table|json [default: table] Format output
  -h, --help show CLI help
  +<<<<<<< HEAD
  --config=config [default: /Users/bergundy/.shiftjs/shiftjs.config.yml]
  +=======
  + --config=config [default: /Users/ariels/.shiftjs/shiftjs.config.yml]
  +>>>>>>> rush and oclif file changes
  EXAMPLE
  $ shift-cli list
  @@ -163,7 +183,11 @@ OPTIONS
  -h, --help show CLI help
  -l, --limit=limit [default: 500] Limit number of entries shown (cannot exceed 1000).
  -s, --since=since [default: 1m] Output logs since the given ISO 8601 timestamp or time period.
  +<<<<<<< HEAD
  --config=config [default: /Users/bergundy/.shiftjs/shiftjs.config.yml]
  +=======
  + --config=config [default: /Users/ariels/.shiftjs/shiftjs.config.yml]
  +>>>>>>> rush and oclif file changes
  EXAMPLES
  // retrieve all logs
  @@ -199,7 +223,11 @@ ARGUMENTS
  OPTIONS
  -h, --help show CLI help
  +<<<<<<< HEAD
  --config=config [default: /Users/bergundy/.shiftjs/shiftjs.config.yml]
  +=======
  + --config=config [default: /Users/ariels/.shiftjs/shiftjs.config.yml]
  +>>>>>>> rush and oclif file changes
  EXAMPLE
  $ shift-cli try 123
  @@ -217,7 +245,11 @@ USAGE
  OPTIONS
  -h, --help show CLI help
  +<<<<<<< HEAD
  --config=config [default: /Users/bergundy/.shiftjs/shiftjs.config.yml]
  +=======
  + --config=config [default: /Users/ariels/.shiftjs/shiftjs.config.yml]
  +>>>>>>> rush and oclif file changes
  EXAMPLE
  $ shift-cli whoami
  