From 72836e52e1e386c2f4f5dd70553914a3c8feb325 Mon Sep 17 00:00:00 2001 From: Jonas Gunz Date: Sun, 19 Oct 2014 22:35:32 +0200 Subject: Uploaded --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes index 412eeda..157cc39 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,6 +8,9 @@ *.vbproj merge=union *.fsproj merge=union *.dbproj merge=union +*.cproj merge=union + + # Standard to msysgit *.doc diff=astextplain -- cgit v1.2.3