Fix conflicts.

This commit is contained in:
ANtlord committed 2020-01-22 11:12:09 +02:00
commit 9bc01da9c4
228 files changed
+6062 -2538

No files matched your search

+2 -1
View File
@@ -6,6 +6,7 @@ from jedi.plugins import stdlib
from jedi.plugins import flask
from jedi.plugins import django
from jedi.plugins import plugin_manager
from jedi.plugins import pytest
plugin_manager.register(stdlib, flask, django)
plugin_manager.register(stdlib, flask, pytest, django)