Give merge_conflicts its own deadline instead of the 30s request default - #38

Give merge_conflicts its own deadline instead of the 30s request default#38

TheValiantOne merged 1 commit into

mainTheValiantOne/WitcherScriptMerger:mainfrom

fix/mcp-merge-call-timeoutTheValiantOne/WitcherScriptMerger:fix/mcp-merge-call-timeoutCopy head branch name to clipboard