[virtualcommons-developer] commit/vcweb: dieg...@gmail.com: accidentally committed conflicted migration

[<com...@bi...>]

1 new commit in vcweb:

https://bitbucket.org/virtualcommons/vcweb/commits/c3e6e9c956a7/
Changeset:   c3e6e9c956a7
User:        dieg...@gmail.com
Date:        2013-03-26 23:08:23
Summary:     accidentally committed conflicted migration
Affected #:  1 file

diff -r 5d4558cd408b897968aea2dca076e8427cf0673d -r c3e6e9c956a734fb1ebef8760a2dec9e44fd0238 vcweb/broker/migrations/0003_add_broker_parameters_payoff.py
--- a/vcweb/broker/migrations/0003_add_broker_parameters_payoff.py
+++ b/vcweb/broker/migrations/0003_add_broker_parameters_payoff.py
@@ -13,40 +13,18 @@
         Parameter = orm['core.Parameter']
         experimenter = Experimenter.objects.get(pk=1)
         Parameter.objects.create(
-<<<<<<< local
                 name='payoff',
-=======
-                name='participant_payoff',
->>>>>>> other
                 scope='participant',
-<<<<<<< local
                 type='float',
                 description='earning each participant gets at each round',
-=======
-                type='int',
-                description='the earning each participant gets at each round',
->>>>>>> other
                 creator=experimenter)
 
 
-<<<<<<< local
-=======
 
->>>>>>> other
     def backwards(self, orm):
         "Write your backwards methods here."
         Parameter = orm['core.Parameter']
-<<<<<<< local
         Parameter.objects.get(name='payoff').delete()
-=======
-        Parameter.objects.get(name='conservation_decision').delete()
-        Parameter.objects.get(name='max_hours').delete()
-        Parameter.objects.get(name='group_local_bonus').delete()
-        Parameter.objects.get(name='group_cluster_bonus').delete()
-        Parameter.objects.get(name='participant_link').delete()
-        Parameter.objects.get(name='group_local_bonus_threshold').delete()
-        Parameter.objects.get(name='group_cluster_bonus_threshold').delete()
->>>>>>> other
 
     models = {
         u'auth.group': {

Repository URL: https://bitbucket.org/virtualcommons/vcweb/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.