merge conflicts...

This commit is contained in:
luigi-rosso
2022-11-04 17:42:56 +00:00
parent 56e9c53211
commit 57f8b5f48e
2 changed files with 5 additions and 1 deletions

View File

@ -1 +1 @@
e9dd8cafff046c2b930d0c7061adc65047961d02 f15304279962053360702d3ef8443d110d444893

View File

@ -9,7 +9,11 @@ Runtime docs are available in [Rive's help center](https://help.rive.app/runtime
[Rive](https://rive.app/) is a real-time interactive design and animation tool. Use our collaborative editor to create motion graphics that respond to different states and user inputs. Then load your animations into apps, games, and websites with our lightweight open-source runtimes. [Rive](https://rive.app/) is a real-time interactive design and animation tool. Use our collaborative editor to create motion graphics that respond to different states and user inputs. Then load your animations into apps, games, and websites with our lightweight open-source runtimes.
<<<<<<< ours
## Add to pubspec.yaml ## Add to pubspec.yaml
=======
## Add dependency to pubspec.yaml
>>>>>>> theirs
```yaml ```yaml
dependencies: dependencies: