Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit bdf3cd79 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Update talks to fix unreolved conflict.

parent 279a5a59
......@@ -4,17 +4,10 @@
import traceback
<<<<<<< HEAD
from .automaton import Automaton
from .base import MSG_CRASH, MSG_LOAD
from .checkandfix import CheckException
from plugin_dbui import UNDEF_ID
=======
from automaton import Automaton
from base import MSG_CRASH, MSG_LOAD
from checkandfix import CheckException
from plugin_dbui import get_id, UNDEF_ID
>>>>>>> Modify the logic to deal with synonyms.
class Talks(Automaton):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment