aboutsummaryrefslogtreecommitdiff
path: root/delivery_merge/merge.py
diff options
context:
space:
mode:
Diffstat (limited to 'delivery_merge/merge.py')
-rw-r--r--delivery_merge/merge.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/delivery_merge/merge.py b/delivery_merge/merge.py
index e8a9ba1..457c433 100644
--- a/delivery_merge/merge.py
+++ b/delivery_merge/merge.py
@@ -2,8 +2,7 @@ import os
import re
import yaml
from .conda import conda, conda_env_load
-from .git import git
-from .utils import pushd
+from .utils import git, pushd
from glob import glob
from subprocess import run