From d742d4fb8c8d601c19f7aa5ff746a4167d864f7e Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Mon, 5 Dec 2016 15:55:43 +1300
Subject: Replace configargparse with argparse, enable new options loading

This commit ditches configargparse and enables the new config file format. The
default location is ~/.mitmproxy/config.yaml. Unifying all of the various
Options objects will follow in the next patch.
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index e942ea94..91caf620 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 .DS_Store
 MANIFEST
-*/tmp
+**/tmp
 /venv*
 *.py[cdo]
 *.swp
-- 
cgit v1.2.3