about summary refs log tree commit diff
path: root/data/server.conf.in
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2017-05-11 15:03:26 +0200
committerMichael Biebl <biebl@debian.org>2017-05-11 15:03:26 +0200
commit04996460fa839109b6318838d1f41e5f3ef8139a (patch)
treecb35e54363b8ea8e78e6978a92fb68ae9409e116 /data/server.conf.in
parent1ae6f6dc1b3c266401a4709995991b967320139a (diff)
parentc333f062ddcba9b35330647bf6cbd0a07f2d786e (diff)
Merge tag 'upstream/1.8.0' into experimental
Upstream version 1.8.0
Diffstat (limited to 'data/server.conf.in')
-rw-r--r--data/server.conf.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/server.conf.in b/data/server.conf.in
index a63be511..2eac5a12 100644
--- a/data/server.conf.in
+++ b/data/server.conf.in
@@ -1,4 +1,4 @@
-# This configuration file, when placed into into
+# This configuration file, when placed into
 # @sysconfdir@/NetworkManager/conf.d will change NetworkManager's
 # behavior to what's expected on "traditional UNIX server" type
 # deployments.