From 2b62fe68e522556177b791b0773ffcbed8d691ba Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sat, 25 Dec 2021 02:18:42 -0500
Subject: [PATCH] gitattributes: ignore PinDMs in merge

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

diff --git a/.gitattributes b/.gitattributes
index 660acec..c2e734c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 flake.lock merge=ignore
+users/infinidoge/config/powercord/PinDMs.json merge=ignore