updates and fixes for unified headers (#1114)
[termux-packages] / disabled-packages / openjdk-9-jre-headless / consistency-configure.patch
diff --git a/disabled-packages/openjdk-9-jre-headless/consistency-configure.patch b/disabled-packages/openjdk-9-jre-headless/consistency-configure.patch
deleted file mode 100644 (file)
index 0de579b..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./common/autoconf/generated-configure.sh   2017-05-12 23:47:56.000000000 +0530
-+++ ../generated-configure.sh  2017-05-13 10:06:09.764530254 +0530
-@@ -5195,13 +5195,7 @@
- #CUSTOM_AUTOCONF_INCLUDE
- # Do not change or remove the following line, it is needed for consistency checks:
--<<<<<<< variant A
--DATE_WHEN_GENERATED=1493303684
-->>>>>>> variant B
- DATE_WHEN_GENERATED=1493884285
--####### Ancestor
--DATE_WHEN_GENERATED=1492975963
--======= end
- ###############################################################################
- #