From a32b43bf2f1ab838fef3fe5b3c9374aa4b853215 Mon Sep 17 00:00:00 2001
From: Davide Laezza <davide.laezza@gmx.com>
Date: Sun, 28 Apr 2019 18:38:42 +0200
Subject: [PATCH] Fixing conflicts with master

---
 dotdrop/config.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dotdrop/config.py b/dotdrop/config.py
index 293d8be..e6cddfa 100644
--- a/dotdrop/config.py
+++ b/dotdrop/config.py
@@ -44,6 +44,9 @@ class Cfg:
     # import keys
     key_import_vars = 'import_variables'
     key_import_actions = 'import_actions'
+    key_cmpignore = 'cmpignore'
+    key_upignore = 'upignore'
+
     key_import_configs = 'import_configs'
 
     # actions keys