From 984a084705f358bc9799d634eb81427e81982051 Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageialinux-online.org>
Date: Sun, 25 Jun 2017 18:38:09 +0200
Subject: Update translations

---
 ca/addUser.html | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'ca/addUser.html')

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>
                             
-- 
cgit v1.2.1