Permalink
Browse files

Fix merge conflict

  • Loading branch information...
2 parents 8354c80 + 4b5c166 commit 356d0cd4823bc3265d40863e526cf3494ca18fee @mitechie committed Mar 24, 2013
Showing with 17 additions and 0 deletions.
  1. +17 −0 test_psql.ini
View
@@ -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

0 comments on commit 356d0cd

Please sign in to comment.