From 36740d90353c92e814917a0688764875fda49558 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Tue, 7 May 2019 00:22:20 -0400
Subject: Refactor:

* Remove git.py
* Replace duplicate code with simple wrapper
* Add README.md
* Add LICENSE.txt
---
 delivery_merge/merge.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'delivery_merge/merge.py')

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
 
-- 
cgit