From 9a574bea25f4560517aca9e6cc0c889fc853f48d Mon Sep 17 00:00:00 2001
From: Jan Siwiec <jan.siwiec@vsb.cz>
Date: Tue, 18 Jan 2022 11:50:00 +0100
Subject: [PATCH] Update einfracz-migration.md

---
 docs.it4i/einfracz-migration.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs.it4i/einfracz-migration.md b/docs.it4i/einfracz-migration.md
index 0ec5caf4d..7d395cadd 100644
--- a/docs.it4i/einfracz-migration.md
+++ b/docs.it4i/einfracz-migration.md
@@ -39,14 +39,9 @@ After the migration process is completed, you will receive a confirmation email
 
 ## Steps After Migration
 
-<<<<<<< HEAD
-Successfully migrated accounts tied to e-INFRA CZ can be self-managed at [e-INFRA CZ User profile][4].
-With this account, you will have access to all IT4I services as well as to [e-INFRA CZ services][5].
-=======
 After the migration, you must use your **e-INFRA CZ credentials** to access all IT4I services as well as [e-INFRA CZ services][5].
 
 Successfully migrated accounts tied to e-INFRA CZ can be self-managed at [e-INFRA CZ User profile][4].
->>>>>>> master
 
 !!! tip "Recommendation"
     After migration, we recommend [verifying your SSH keys][6] for cluster access.
-- 
GitLab