cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflict

Browse source
This commit is contained in:
Helmut Merz 2012-05-15 16:48:01 +02:00
parent bcacbe6145
commit ae04c1ec8d
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
composer/report/field.py
View file

@ -121,14 +121,8 @@ class Field(Component):
return self.getValue(row)
def getSortValue(self, row):
<<<<<<< HEAD
# TODO: consider 'descending' flag (?use raw value instead of formatted one?)
return self.getValue(row)
#return getattr(row, self.name, None)
=======
# TODO: consider 'descending' flag
return self.getValue(row)
>>>>>>> master
class CalculatedField(Field):