Merge conflicts in update_inara.

2016-01-21 14:47:06 -05:00 · 2016-01-21 14:47:06 -05:00 · 3f02d4468f
commit 3f02d4468f
parent c41e7d5de5 b4aaf5c2c1
1 changed files with 1 additions and 0 deletions
--- a/update_inara.py
+++ b/update_inara.py
@ -1,5 +1,6 @@
 #!/usr/bin/python

+import easygui
 from elite_api import companion
 from elite_api.inara import InaraSession
 import utils