aboutsummaryrefslogtreecommitdiffstats
path: root/ca/addUser.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 /ca/addUser.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 'ca/addUser.html')
-rw-r--r--ca/addUser.html16
1 files changed, 0 insertions, 16 deletions
diff --git a/ca/addUser.html b/ca/addUser.html
index b53ddef..b9f9e95 100644
--- a/ca/addUser.html
+++ b/ca/addUser.html
@@ -23,16 +23,8 @@
</div>
</div>
-<<<<<<< HEAD
-=======
-
-
-
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="Estableix la contrasenya d'administrador (root):">
<div class="titlepage">
@@ -146,19 +138,11 @@
<p>Any user you add while installing Mageia, will have a both read and write
protected home directory (umask=0027).
</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>You can add all extra needed users in the <span class="emphasis"><em>Configuration -
Summary</em></span> step during the install. Choose <span class="emphasis"><em>User
management</em></span>.
</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>Els permisos d'acc&eacute;s tamb&eacute; es poden modificar despr&eacute;s de la instal&middot;laci&oacute;.</p>