From b2c1b4e49944e70ccfaa39ddbb8da3e9019c3148 Mon Sep 17 00:00:00 2001 From: lbono Date: Tue, 27 Nov 2018 14:05:38 -0800 Subject: [PATCH] Cleaned up after merge. --- config.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config.py b/config.py index 311075c..8062a71 100755 --- a/config.py +++ b/config.py @@ -81,13 +81,8 @@ lfs_url = "https://github.com/%s/%s.git/info/lfs/objects/batch" % (org, repo) raw_url = "https://raw.githubusercontent.com/%s/%s/%s/" % (org, repo, branch) manifest_url = "https://raw.githubusercontent.com/%s/%s/%s/%s" % (org, repo, branch, manifest) manifest_file = "%s/%s" % (local_dir, manifest) -<<<<<<< HEAD -default_manifest_hash = "3fce17a83f63c869025e2072e3ed6f46677390fccb073ae3081e36aaf3d03f47" -ambient_manifest_hash = "153b5cd48a45aed3811295858e2937be687d751085304bb5b40df5182f0ff4e5" -======= default_manifest_hash = "533caf6e097dd2189d38fdf99f343ec5261dd594442e954f5e30384c23e17aab" ambient_manifest_hash = "56592f48558895ed8ab693095d00bca58f676d42316c5d22420c8df9b95d3442" ->>>>>>> feat-nopromptbg manifest_hash = default_manifest_hash if manifest == "ambient_manifest.json":