SRS: fix mismerge

[exim.git] / src / README

diff --git a/src/README b/src/README
index 225295efb3adf926c2edf7fea36cf8fab26b568c..e335cc22e5e96c4e726c89bdde329715e0e90d22 100644 (file)
--- a/src/README
+++ b/src/README
@@ -2,6 +2,7 @@ THE EXIM MAIL TRANSFER AGENT VERSION 4
 --------------------------------------
 
 Copyright (c) 1995 - 2018 University of Cambridge.
 --------------------------------------
 
 Copyright (c) 1995 - 2018 University of Cambridge.

+SPDX-License-Identifier: GPL-2.0-or-later

 See the file NOTICE for conditions of use and distribution.
 
 There is a book about Exim by Philip Hazel called "The Exim SMTP Mail Server",
 See the file NOTICE for conditions of use and distribution.
 
 There is a book about Exim by Philip Hazel called "The Exim SMTP Mail Server",


@@ -150,6 +151,7 @@ system and architecture types respectively, the files used are:
   Local/Makefile-<ostype>
   Local/Makefile-<archtype>
   Local/Makefile-<ostype>-<archtype>
   Local/Makefile-<ostype>
   Local/Makefile-<archtype>
   Local/Makefile-<ostype>-<archtype>

+  Local/Makefile-<buildname>

   OS/Makefile-Base
 
 Of the Local/* files, only Local/Makefile is required to exist; the rest are
   OS/Makefile-Base
 
 Of the Local/* files, only Local/Makefile is required to exist; the rest are