diff options
| author | Jim Porter <jporterbugs@gmail.com> | 2023-08-21 18:19:24 -0700 |
|---|---|---|
| committer | Jim Porter <jporterbugs@gmail.com> | 2023-08-21 18:22:59 -0700 |
| commit | 0df2efa4d6953fb3dbc50c5faa845e80154b447b (patch) | |
| tree | a267efeb67f5d4c1ea87a54724a27ca2ad4aed65 /java | |
| parent | b7bd7e92a969f012c8e6ad8d0cdbffd758054cab (diff) | |
; 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.
Diffstat (limited to 'java')
| -rw-r--r-- | java/README | 1 |
1 files changed, 0 insertions, 1 deletions
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; }; - |