From 0cd65441d1fef7e202a39b00712ea630f80c7eb1 Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Wed, 16 Jun 2021 20:46:15 -0500 Subject: [PATCH] Add a note about deleting pom.xml in first patch --- patches/server/0001-Setup-Gradle-project.patch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index 9f84d3b176..e4f6fd9dd8 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -3,6 +3,9 @@ From: Kyle Wood Date: Thu, 10 Dec 2020 20:54:19 -0800 Subject: [PATCH] Setup Gradle project +The pom.xml file is deleted in this patch so the patch will fail to +apply if there are changes made to it from upstream - thus notifying us +that changes were made. diff --git a/.gitignore b/.gitignore index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..3e05459f27c4c5697ae65da504d67a6a2f617b57 100644