From f323af538650389108a65965e792794ec41643e2 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 21 Feb 2025 10:35:14 +0100
Subject: [PATCH] oca-port: blacklist PR(s) 2744, 2668 for jsonifier

---
 .oca/oca-port/blacklist/jsonifier.json | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .oca/oca-port/blacklist/jsonifier.json

diff --git a/.oca/oca-port/blacklist/jsonifier.json b/.oca/oca-port/blacklist/jsonifier.json
new file mode 100644
index 000000000..f1605ad14
--- /dev/null
+++ b/.oca/oca-port/blacklist/jsonifier.json
@@ -0,0 +1,6 @@
+{
+  "pull_requests": {
+    "OCA/server-tools#2744": "too many conflicts, will run pre-commit afterwards",
+    "OCA/server-tools#2668": "Ported manually bc of too many conflicts"
+  }
+}