I tried to uplift this, however got conflicts: warning: conflicts while merging browser/components/newtab/common/PrerenderData.jsm! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/content-src/components/DiscoveryStreamComponents/Hero/Hero.jsx! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/content-src/components/DiscoveryStreamComponents/List/List.jsx! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/content-src/components/DiscoveryStreamComponents/SpocIntersectionObserver/SpocIntersectionObserver.jsx! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/css/activity-stream-linux.css.map! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/css/activity-stream-mac.css.map! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/css/activity-stream-windows.css.map! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/data/content/activity-stream.bundle.js! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/data/content/activity-stream.bundle.js.map! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/lib/ActivityStream.jsm! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/lib/DiscoveryStreamFeed.jsm! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/locales-src/mr/strings.properties! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/locales-src/sr/strings.properties! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/prerendered/locales/mr/activity-stream-prerendered-noscripts.html! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/prerendered/locales/mr/activity-stream-prerendered.html! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/prerendered/locales/sr/activity-stream-prerendered-noscripts.html! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/prerendered/locales/sr/activity-stream-prerendered.html! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/List.test.jsx! (edit, then use 'hg resolve --mark') warning: conflicts while merging browser/components/newtab/test/unit/lib/DiscoveryStreamFeed.test.js! (edit, then use 'hg resolve --mark')
Bug 1524321 Comment 10 Edit History
Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.
Aryx, can you please uplift this?