Merged conflicts.
This commit is contained in:
parent
48f1d0b26f
commit
50371b6abd
23 changed files with 39 additions and 39 deletions
|
|
@ -126,7 +126,7 @@ class HelpEntryManager(models.Manager):
|
|||
topic.help_category = default_category
|
||||
topic.save()
|
||||
string = "Help database moved to category %s" % default_category
|
||||
logger.log_infomsg(string)
|
||||
logger.log_info(string)
|
||||
|
||||
def search_help(self, ostring, help_category=None):
|
||||
"""
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue