From bb2bcbace484f2696f2fd60ebcd39ee42cb5aee9 Mon Sep 17 00:00:00 2001
From: Sebastien <seb6596@gmail.com>
Date: Thu, 1 Mar 2018 12:52:31 +0100
Subject: [PATCH] edit gitattr

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

diff --git a/.gitattributes b/.gitattributes
index 6d99763..3c8fdee 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 Jenkinsfile merge=ours 
+Dockerfile merge=ours