search

bcgov / bcrs-shared-components

BCRS Shared Components is a multi-package Lerna repository of shared Vue components, each published individually and that you can explore/ develop/ document/ test using Storybook.
https://bcgov.github.io/bcrs-shared-components/
Apache License 2.0
3 stars 30 forks source link

added clearable option to date picker #104

Closed kialj876 closed 2 years ago

kialj876 commented 2 years ago

Signed-off-by: Kial Jinnah kialj876@gmail.com

Issue #: /bcgov/entity#10146

Description of changes:

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the business-filings-ui license (Apache 2.0).

cameron-eyds commented 2 years ago

There was a recent commit here that might have caused the conflict. Perhaps rebase main, try a rebuild and commit that. 🤞 Hopefully that resolves the conflict!

kialj876 commented 2 years ago

There was a recent commit here that might have caused the conflict. Perhaps rebase main, try a rebuild and commit that. 🤞 Hopefully that resolves the conflict!

ah yeah I just did it through the UI since it was super tiny

cameron-eyds commented 2 years ago

There was a recent commit here that might have caused the conflict. Perhaps rebase main, try a rebuild and commit that. 🤞 Hopefully that resolves the conflict!

ah yeah I just did it through the UI since it was super tiny

No prob, sounds good!

kialj876 commented 2 years ago

There was a recent commit here that might have caused the conflict. Perhaps rebase main, try a rebuild and commit that. 🤞 Hopefully that resolves the conflict!

ah yeah I just did it through the UI since it was super tiny

No prob, sounds good!

Oh now it actually shows all the other changes from that in my diff :( (just in that specific commit at least not the total diff)

next time I won't do that!