From b611c49aa2aa680c41f3e424a706cd7f803dd035 Mon Sep 17 00:00:00 2001
From: rik43 <rik@is-i.ru>
Date: Mon, 17 Jul 2017 16:55:50 +0300
Subject: [PATCH] Update passwords_youporn2012.txt

merge conflict clear
---
 Passwords/passwords_youporn2012.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Passwords/passwords_youporn2012.txt b/Passwords/passwords_youporn2012.txt
index c499dd69..594946e9 100644
--- a/Passwords/passwords_youporn2012.txt
+++ b/Passwords/passwords_youporn2012.txt
@@ -4061,7 +4061,4 @@ lolol123
 hello2
 hooligan1
 joker666
-hielox
-<<<<<<< HEAD
-=======
 hielox