summaryrefslogtreecommitdiff
path: root/backend/pixma.conf.in
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
commit64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch)
tree4303648095deff998ae20c2393b56db527742ac9 /backend/pixma.conf.in
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/pixma.conf.in')
-rw-r--r--backend/pixma.conf.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/backend/pixma.conf.in b/backend/pixma.conf.in
index d6184b4..dcf88d3 100644
--- a/backend/pixma.conf.in
+++ b/backend/pixma.conf.in
@@ -6,7 +6,7 @@
# networking=no
#
# bjnp-timeout=5000
-# Specify the timeout (in ms) to be used for all the folllowing
+# Specify the timeout (in ms) to be used for all the following
# scanners.
# May be specified multiple times.
# The last value (if any) will be used for auto-detection