aboutsummaryrefslogtreecommitdiffstats
path: root/de/misc-params.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
commit984a084705f358bc9799d634eb81427e81982051 (patch)
tree73c16dffc5c3134cdf85a94c26c8564b972789e1 /de/misc-params.html
parentc26420407d1f1a586b943c41977152969c5eec0c (diff)
downloaddrakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.gz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.bz2
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.xz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.zip
Update translations
Diffstat (limited to 'de/misc-params.html')
-rw-r--r--de/misc-params.html5
1 files changed, 0 insertions, 5 deletions
diff --git a/de/misc-params.html b/de/misc-params.html
index 5b95a67..cf134e8 100644
--- a/de/misc-params.html
+++ b/de/misc-params.html
@@ -199,14 +199,9 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p>Wenn Sie feststellen, dass ein falsches Tastaturlayout verwendet wird und
Sie dieses &auml;ndern m&ouml;chten, beachten Sie, das sich Ihr Passwort hierdurch
auch &auml;ndert.
-=======
- <p>If you notice a wrong keyboard layout and want to change it, keep in mind
- that your passwords are going to change too.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</td>