From 94fb6842eea7c8a0cbf5d447293a8be1cbf6a38b Mon Sep 17 00:00:00 2001
From: RElesgoe <relesgoe@gmail.com>
Date: Thu, 4 Jan 2018 02:24:54 -0800
Subject: [PATCH] Update .gitignore

---
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4ffa072..4ce21e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,8 @@
 ################################################################################
 
 /zlib
-/conf
 /cmake/Modules
 /build
 /lua5.1
-/.vs
\ No newline at end of file
+/.vs
+/CMakeSettings.json