git: ada7fd17d57f - main - etcupdate: Trim trailing whitespace.

[John Baldwin]

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=ada7fd17d57fac3dbafff5a1b3268afb872c8b0b

commit ada7fd17d57fac3dbafff5a1b3268afb872c8b0b
Author:     John Baldwin <jhb at FreeBSD.org>
AuthorDate: 2021-04-20 20:22:24 +0000
Commit:     John Baldwin <jhb at FreeBSD.org>
CommitDate: 2021-04-20 20:22:24 +0000

    etcupdate: Trim trailing whitespace.
    
    Reviewed by:    imp
    MFC after:      2 weeks
    Differential Revision:  https://reviews.freebsd.org/D29845
---
 usr.sbin/etcupdate/etcupdate.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh
index d0c27805562e..2b14b3a4d71b 100755
--- a/usr.sbin/etcupdate/etcupdate.sh
+++ b/usr.sbin/etcupdate/etcupdate.sh
@@ -442,7 +442,7 @@ empty_destdir()
 #
 # $1 - first tree
 # $2 - second tree
-# $3 - node name 
+# $3 - node name
 # $4 - label for first tree
 # $5 - label for second tree
 diffnode()
@@ -867,7 +867,7 @@ merge_file()
 # $1 - pathname of the file to resolve (relative to DESTDIR)
 has_conflicts()
 {
-	
+
 	egrep -q '^(<{7}|\|{7}|={7}|>{7}) ' $CONFLICTS/$1
 }
 
@@ -1526,7 +1526,7 @@ EOF
 	if [ -n "$preworld" ]; then
 		> $WORKDIR/removed.files
 	fi
-	
+
 	# The order for the following sections is important.  In the
 	# odd case that a directory is converted into a file, the
 	# existing subfiles need to be removed if possible before the