From 0df2efa4d6953fb3dbc50c5faa845e80154b447b Mon Sep 17 00:00:00 2001
From: Jim Porter
Date: Mon, 21 Aug 2023 18:19:24 -0700
Subject: ; Fix issues running gitmerge

* .gitattributes: Ignore whitespace issues in java/INSTALL.

* build-aux/git-hooks/pre-commit (git_diff): Explicitly allow
"ChangeLog.android".

* java/README: Remove extra trailing newline.
---
 java/README | 1 -
 1 file changed, 1 deletion(-)

(limited to 'java')

diff --git a/java/README b/java/README
index a6adb805b9e..e518e9fbb2f 100644
--- a/java/README
+++ b/java/README
@@ -1046,4 +1046,3 @@ public class Foo
 {
   Object bar;
 };
-
-- 
cgit v1.2.1