Merge conflicts in update_inara.

This commit is contained in:
Anna Rose 2016-01-21 14:47:06 -05:00
commit 3f02d4468f

View File

@ -1,5 +1,6 @@
#!/usr/bin/python #!/usr/bin/python
import easygui
from elite_api import companion from elite_api import companion
from elite_api.inara import InaraSession from elite_api.inara import InaraSession
import utils import utils