From 460ed6722003d2c0d12c68febc5226aa516dcb36 Mon Sep 17 00:00:00 2001 From: Footsiefat <12180913+Footsiefat@users.noreply.github.com> Date: Mon, 25 Oct 2021 17:20:08 +1300 Subject: [PATCH] tryna fix merge conflicts the lazy way for PR #115 --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9834e1b0..65696cee 100644 --- a/.gitignore +++ b/.gitignore @@ -150,4 +150,7 @@ ZSpotify\ Music/ ZSpotify\ Podcasts/ # Intellij -.idea \ No newline at end of file +.idea + +# Config file +zs_config.json