aboutsummaryrefslogtreecommitdiffstats
path: root/cs/uninstall-Mageia.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 /cs/uninstall-Mageia.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 'cs/uninstall-Mageia.html')
-rw-r--r--cs/uninstall-Mageia.html4
1 files changed, 0 insertions, 4 deletions
diff --git a/cs/uninstall-Mageia.html b/cs/uninstall-Mageia.html
index e09c137..4d14827 100644
--- a/cs/uninstall-Mageia.html
+++ b/cs/uninstall-Mageia.html
@@ -31,11 +31,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e1244"></a>Jak na to
-=======
- <h3 class="title"><a name="d5e1273"></a>Jak na to
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>