This is an automated email from the ASF dual-hosted git repository. maximebeauchemin pushed a change to branch dm/chore/migrate-favstar-to-api-v1 in repository https://gitbox.apache.org/repos/asf/superset.git
was 58bfd44627 fix merge conflict
The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.
