diff options
Diffstat (limited to 'src/lib/asiodns')
| -rw-r--r-- | src/lib/asiodns/.gitattributes | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/asiodns/.gitattributes b/src/lib/asiodns/.gitattributes index d54ab66be3..1dc2d8bcfa 100644 --- a/src/lib/asiodns/.gitattributes +++ b/src/lib/asiodns/.gitattributes @@ -1,2 +1,2 @@ -/asiodns_messages.cc -diff merge=ours -/asiodns_messages.h -diff merge=ours +/asiodns_messages.cc -diff merge=ours +/asiodns_messages.h -diff merge=ours |