Fix merge conflict.
authorWayne Davison <wayne@opencoder.net>
Tue, 7 Jul 2020 15:57:37 +0000 (08:57 -0700)
committerWayne Davison <wayne@opencoder.net>
Tue, 7 Jul 2020 15:57:37 +0000 (08:57 -0700)
commitd26810e8820b5b4782626a7081645241e03b0dd7
tree726e88949856ed8b88c24fa7e2af2977a1b8538c
parent8510a9efa4d53d550faf68165ad43b2fb44a88df
Fix merge conflict.
fileflags.diff