From 7b5e9dd914f9914053f59a2f298f6ce1617c3e73 Mon Sep 17 00:00:00 2001
From: Francois B <shakasan@sirenacorp.be>
Date: Mon, 19 Mar 2018 06:43:48 +0100
Subject: [PATCH] .

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 4b4e8ae..610dd86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 backup/*
 deb/*
 .remote-sync.json
+*.sync-conflict-*