Fix merge conflict

mitechie · Mar 24, 2013 · 356d0cd · 356d0cd
2 parents 8354c80 + 4b5c166
commit 356d0cd
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/test_psql.ini b/test_psql.ini
@@ -1,4 +1,21 @@
+<<<<<<< HEAD
 [app:bookie]
+=======
+[app::call <SNR>22_LustyJugglerKeyPressed('b')
+oo:call <SNR>22_LustyJugglerKeyPressed('8')
+:call <SNR>22_LustyJugglerKeyPressed('7')
+    :call <SNR>22_LustyJugglerKeyPressed('7')
+     u:call <SNR>22_LustyJugglerCancel()
+       :call <SNR>22_LustyJugglerCancel()
+        :call <SNR>22_LustyJugglerCancel()
+         :call <SNR>22_LustyJugglerCancel()
+          :call <SNR>22_LustyJugglerCancel()
+           :call <SNR>22_LustyJugglerCancel()
+            :call <SNR>22_LustyJugglerCancel()
+             ::call <SNR>22_LustyJugglerCancel()
+             :call <SNR>22_LustyJugglerCancel()
+              ]
+>>>>>>> 4b5c1669db1906cb3288bb00c5c27cd4599011d0
 use = egg:bookie
 pyramid.reload_templates = true
 pyramid.debug_authorization = false