From c7a0195cdd09183ae992262475f6400191e3545b 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/Setup-Gradle-project.patch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch index 8c692860c5..59edee3d30 100644 --- a/patches/server/Setup-Gradle-project.patch +++ b/patches/server/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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644