close
The Wayback Machine - https://web.archive.org/web/20221102113426/https://github.com/plausible/analytics/pull/2412
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove conflict artifact #2412

Merged
merged 1 commit into from Nov 2, 2022
Merged

remove conflict artifact #2412

merged 1 commit into from Nov 2, 2022
+0 −2

Conversation

ruslandoga
Copy link
Contributor

@ruslandoga ruslandoga commented Nov 2, 2022 •
edited

Changes

This PR removes a <<<<... conflict artefact that I think was added at some point by mistake.

4096d88

Tests

  • This PR does not require tests

Changelog

  • This PR does not make a user-facing change

Documentation

  • This change does not need a documentation update

Dark mode

  • This PR does not change the UI

@ruslandoga ruslandoga requested a review from ukutaht Nov 2, 2022
@bundlemon
Copy link

bundlemon bot commented Nov 2, 2022 •
edited

BundleMon

Unchanged files (7)
Status Path Size Limits
✅ static/css/app.css
 515.19KB -
✅ static/js/dashboard.js
 296.06KB -
✅ static/js/app.js
 12.13KB -
✅ static/js/embed.host.js
 5.58KB -
✅ static/js/embed.content.js
 5.06KB -
✅ tracker/js/plausible.js
 748B -
✅ static/js/applyTheme.js
 314B -

No change in files bundle size

Final result: ✅

View report in BundleMon website ➡️

Current branch size history | Target branch size history

@ruslandoga ruslandoga requested a review from aerosol Nov 2, 2022
aerosol
aerosol approved these changes Nov 2, 2022
View changes
@aerosol aerosol merged commit 9b97361 into plausible:master Nov 2, 2022
6 checks passed
@ruslandoga ruslandoga deleted the clean-changelog branch Nov 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aerosol aerosol

@ukutaht ukutaht

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ruslandoga @aerosol