Commit 8eb69808 authored by Siarhei Khaletski (EPAM)'s avatar Siarhei Khaletski (EPAM) 🚩
Browse files

Merge branch 'kibattul/fix-import-errors' into 'master'

Fixed conflicting names in same folder

See merge request !6
parents 2721de07 de739441
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from osdu_api.model.legal_compliance import LegalCompliance
from osdu_api.model.legal.legal_compliance import LegalCompliance
class Legal:
"""
......
......@@ -14,8 +14,8 @@
# limitations under the License.
from osdu_api.model.acl import Acl
from osdu_api.model.legal import Legal
from osdu_api.model.legal_compliance import LegalCompliance
from osdu_api.model.legal.legal import Legal
from osdu_api.model.legal.legal_compliance import LegalCompliance
from osdu_api.model.record_ancestry import RecordAncestry
class Record:
......
......@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# from osdu_api.model.legal_compliance import LegalCompliance
# from osdu_api.model.legal.legal_compliance import LegalCompliance
class Legal:
"""
......
......@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# from osdu_api.model.legal_compliance import LegalCompliance
# from osdu_api.model.legal.legal_compliance import LegalCompliance
from osdu_api.model.base import Base
......
Supports Markdown
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