From 6f52e9bd4a689f82ad7d9760d644f87ec8ade91e Mon Sep 17 00:00:00 2001
From: Daniel Miessler <daniel@danielmiessler.com>
Date: Sun, 26 Aug 2012 00:56:39 -0700
Subject: [PATCH] Removed garbage from beginning and end of file

---
 Passwords/passwords_youporn2012.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Passwords/passwords_youporn2012.txt b/Passwords/passwords_youporn2012.txt
index 7b286346..ea521d7a 100644
--- a/Passwords/passwords_youporn2012.txt
+++ b/Passwords/passwords_youporn2012.txt
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> 90c26a255858f5950bc19ad7ad7b04a996785a25
 24585161
 minaboshra
 minamina
@@ -10500,5 +10496,3 @@ zurab
 zvezda
 zx12as45
 zxcvbnm
->>>>>>> 17edbec257de6e2e90edc341c410c7331b7f3726
->>>>>>> 90c26a255858f5950bc19ad7ad7b04a996785a25