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

Merge-conflict-fix-develop #46

Merged
merged 2 commits into from
Dec 15, 2024
Merged

Merge-conflict-fix-develop #46

merged 2 commits into from
Dec 15, 2024

Conversation

injas427
Copy link
Owner

Bumps @react-native-masked-view/masked-view from 0.3.1 to 0.3.2.


updated-dependencies:

  • dependency-name: "@react-native-masked-view/masked-view"
    dependency-type: direct:production
    update-type: version-update:semver-patch
    ...

Signed-off-by: dependabot[bot] support@github.com
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps react-native-gesture-handler from 2.21.0 to 2.21.2.


updated-dependencies:

  • dependency-name: react-native-gesture-handler
    dependency-type: direct:production
    update-type: version-update:semver-patch
    ...

Signed-off-by: dependabot[bot] support@github.com
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


Signed-off-by: dependabot[bot] support@github.com
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

dependabot bot and others added 2 commits December 15, 2024 10:51
Bumps [@react-native-masked-view/masked-view](https://github.com/react-native-masked-view/masked-view) from 0.3.1 to 0.3.2.
- [Release notes](https://github.com/react-native-masked-view/masked-view/releases)
- [Commits](react-native-masked-view/masked-view@v0.3.1...v0.3.2)

---
updated-dependencies:
- dependency-name: "@react-native-masked-view/masked-view"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* added gh workflow (#17) (#18)

* added gh workflow

* added co-owner

* Bump @react-native-masked-view/masked-view in /template (#20)

Bumps [@react-native-masked-view/masked-view](https://github.com/react-native-masked-view/masked-view) from 0.3.1 to 0.3.2.
- [Release notes](https://github.com/react-native-masked-view/masked-view/releases)
- [Commits](react-native-masked-view/masked-view@v0.3.1...v0.3.2)

---
updated-dependencies:
- dependency-name: "@react-native-masked-view/masked-view"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump react-native-gesture-handler from 2.21.0 to 2.21.2 in /template (#25)

Bumps [react-native-gesture-handler](https://github.com/software-mansion/react-native-gesture-handler) from 2.21.0 to 2.21.2.
- [Release notes](https://github.com/software-mansion/react-native-gesture-handler/releases)
- [Commits](software-mansion/react-native-gesture-handler@2.21.0...2.21.2)

---
updated-dependencies:
- dependency-name: react-native-gesture-handler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update dependabot.yml (#28)

* upgraded to rn 0.76.3

* fixed vulnerability

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@injas427 injas427 merged commit 0ec2387 into develop Dec 15, 2024
1 of 2 checks passed
@injas427 injas427 deleted the merge-conflict-fix-develop branch December 15, 2024 05:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant