mirror of
https://github.com/apache/superset.git
synced 2026-09-01 13:01:33 +00:00
The only real conflict was an import-list collision in Timeseries/transformProps.ts (this branch's DTTM_ALIAS next to master's DataRecordValue); kept both. Country-map's regenerated GeoJSON files and notebook edits from master merged cleanly via rename detection onto this branch's already-renamed plugin-chart-country-map/ package, with no overlapping edits to reconcile.