Skip to content

Feature update #28

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.

Sign up for GitHub

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

Open
192472151simats-bot wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Feature update #28

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8df151
Updated README in feature branch
Mar 15, 2026
d8a4b59
Updated README in master branch
Mar 15, 2026
997ebb5
Update README in future branch
Mar 15, 2026
d7a5202
Resolved merge conflict in README
Mar 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,9 @@ You can [fork this repo](https://help.github.com/articles/fork-a-repo/) to creat

``` bash
vue init username/repo my-project
```
<<<<<<< HEAD

This change was made in the feature branch.
This change was made in the feature branch.
=======
This README contains updates from both master and feature branches