solve merge conflict

2025-12-05 23:05:10 -07:00 · 2025-12-05 23:05:10 -07:00 · 3f6a77f890
commit 3f6a77f890
parent 6b21ac7be9 cc05431879
171 changed files with 730 additions and 926 deletions
--- a/pl/utils.pl
+++ b/pl/utils.pl
@ -1,4 +1,3 @@
-# $Id$
 sub add_incdir {
    my $input = $_[0];
    $input =~ s/\r?\n/ /g;