orca r3762 - trunk/src/orca

[joanied svn gnome org]

Author: joanied
Date: Wed Mar 26 16:27:09 2008
New Revision: 3762
URL: http://svn.gnome.org/viewvc/orca?rev=3762&view=rev

Log:
Tweak which (hopefully) will solve the trunk-not-launching problem.


Modified:
   trunk/src/orca/braille.py

Modified: trunk/src/orca/braille.py
==============================================================================
--- trunk/src/orca/braille.py	(original)
+++ trunk/src/orca/braille.py	Wed Mar 26 16:27:09 2008
@@ -610,14 +610,8 @@
         # any label that might be present.
         #
         regionMask += [0]*len(self.eol)
-
-
         if self.label:
-<<<<<<< HEAD:src/orca/braille.py
-            regionMask = [0]*len(self.label) + mask
-=======
             regionMask = [0]*len(self.label) + regionMask
->>>>>>> brl_attributes_cleanup:src/orca/braille.py
 
         return ''.join(map(chr, regionMask))