added comments

Blastitt · Jan 25, 2016 · 74e8923 · 74e8923
2 parents 9dfc8f0 + 4b62830
commit 74e8923
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/mavcrypt.py b/mavcrypt.py
@@ -116,7 +116,10 @@ def encrypt(self, plaintext):
 
 def main():
 
+<<<<<<< HEAD
 	# Will probably add optparse for this
+=======
+>>>>>>> 4b62830d9b174d9551ffee3b9dde06e76daf7e28
 	device = None
 	baudrate = 2048
 	key = None