From ae04c1ec8d288a810142d6303648ce9f50eb432b Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Tue, 15 May 2012 16:48:01 +0200
Subject: [PATCH] fix merge conflict

---
 composer/report/field.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/composer/report/field.py b/composer/report/field.py
index 737ff7c..cf9bf41 100644
--- a/composer/report/field.py
+++ b/composer/report/field.py
@@ -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):