fix some weird cruft from the branch merge

nanotube [2008-03-19 22:31]
fix some weird cruft from the branch merge
Filename
keylogger.pyw
pykeylogger.ini
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 7e6345d..e167fee 100644
Binary files a/pykeylogger.ini and b/pykeylogger.ini differ
ViewGit