diff options
author | Marius Bakke <marius@gnu.org> | 2022-09-10 17:27:06 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-09-10 17:27:06 +0200 |
commit | 07140e8b10c56bc271c74fa82470a900684b91c6 (patch) | |
tree | 8b452a7a676f4791d4d824e19f9892d6ae6eaf82 /gnu/packages/java.scm | |
parent | cbc391102966336a1a175204ebbf4aeec66e3018 (diff) | |
parent | 575dbab74622ee8304827b98865a26225145e22a (diff) | |
download | guix-07140e8b10c56bc271c74fa82470a900684b91c6.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/java.scm')
-rw-r--r-- | gnu/packages/java.scm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 73898d120c..bb172f3bee 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -14323,3 +14323,9 @@ The following TLA+ tools are available in this distribution: @item The PlusCal translator. @end itemize") (license license:expat)))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; |