From a2dd49f661f0cbb062fbb4092455dadd73892782 Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Sat, 13 May 2017 15:07:01 -0600
Subject: [PATCH] Update gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0d28ebc..df78ea5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 vendor
 settings.php
 nbproject/private
-database.mwb.bak
\ No newline at end of file
+database.mwb.bak
+*.sync-conflict*
\ No newline at end of file