Skip to content

Commit

Permalink
Merge branch 'config-file' of github.com:mapbox/mapbox-cli-py into co…
Browse files Browse the repository at this point in the history
…nfig-file

Conflicts:
	mapboxcli/scripts/cli.py
	mapboxcli/scripts/config.py
  • Loading branch information
Sean Gillies committed Dec 16, 2015
2 parents ee6a1ba + 168a1df commit de0406d
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion mapboxcli/scripts/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
Main click group for CLI
"""

from collections import defaultdict
import logging
import os
import sys
Expand Down

0 comments on commit de0406d

Please sign in to comment.