Merge conflicts in update_inara.
This commit is contained in:
commit
3f02d4468f
|
@ -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
|
||||||
|
|
Reference in New Issue
Block a user