From 70eb7b79e40741e73044cfe16f8421af303b74c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Wed, 6 Apr 2022 17:17:26 +0200 Subject: [PATCH] Remove gitattributes for whats_new merge strategy --- .gitattributes | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 3b69ec8a7c3f5..0000000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/doc/whats_new/v*.rst merge=union