git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix mismerge
[exim.git]
/
src
/
OS
/
Makefile-GNU
diff --git
a/src/OS/Makefile-GNU
b/src/OS/Makefile-GNU
index 933256384779744d3afbdf9aa20e0e69cd2c2edc..366ce4263f012281d443e9d436411dc9bf53be9d 100644
(file)
--- a/
src/OS/Makefile-GNU
+++ b/
src/OS/Makefile-GNU
@@
-1,6
+1,7
@@
-# $Cambridge: exim/src/OS/Makefile-GNU,v 1.5 2008/07/25 20:39:55 fanf2 Exp $
-
# Exim: OS-specific make file for GNU and variants.
# Exim: OS-specific make file for GNU and variants.
+#
+# Copyright (c) The Exim Maintainers 2020
+# SPDX-License-Identifier: GPL-2.0-or-later
HAVE_ICONV=yes
HAVE_ICONV=yes