aboutsummaryrefslogtreecommitdiff
path: root/delivery_merge/merge.py
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2019-05-07 00:22:20 -0400
committerJoseph Hunkeler <jhunkeler@gmail.com>2019-05-07 00:22:28 -0400
commit36740d90353c92e814917a0688764875fda49558 (patch)
treea2029b8a3d5e32a622ba3f37185c78be82379548 /delivery_merge/merge.py
parent502bb16cab44aed9e36b6052f725a994b1ffab16 (diff)
downloaddelivery_merge-36740d90353c92e814917a0688764875fda49558.tar.gz
Refactor:
* Remove git.py * Replace duplicate code with simple wrapper * Add README.md * Add LICENSE.txt
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