Changeset 3278 for pykota/trunk

Show
Ignore:
Timestamp:
01/08/08 21:39:30 (17 years ago)
Author:
matt
Message:

Some cruft snuck in my last commit. Removing.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • pykota/trunk/pykota/config.py

    r3277 r3278  
    521521        return self.isTrue(self.getGlobalOption("disablehistory", ignore=1)) 
    522522             
    523 <<<<<<< .mine 
    524 ======= 
    525523    def getUserNameToLower(self) :           
    526524        """Deprecated.""" 
    527525        return self.getGlobalOption("utolower", ignore=1) 
    528526         
    529 >>>>>>> .r2547 
    530527    def getUserNameCase(self) : 
    531528        """Returns value for user name case: upper, lower or native"""