dpgaspar commented on a change in pull request #5449: [schema] Updating the
tables schema
URL:
https://github.com/apache/incubator-superset/pull/5449#discussion_r332393776
##########
File path: superset/connectors/sqla/models.py
##########
@@ -41,9 +41,16 @@
Table,
Text,
)
+<<<<<<< HEAD
from sqlalchemy.exc import CompileError
from sqlalchemy.orm import backref, Query, relationship, RelationshipProperty,
Session
from sqlalchemy.orm.exc import NoResultFound
+=======
+from sqlalchemy.engine.base import Connection
+from sqlalchemy.exc import CompileError, SQLAlchemyError
+from sqlalchemy.orm import backref, relationship
+from sqlalchemy.orm.mapper import Mapper
+>>>>>>> [schema] Updating the tables schema
Review comment:
merge/rebase problem?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
