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.

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

Remove all conflict markers from README #9

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove all conflict markers from README #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ __Tested up to:__ WordPress 5.2
__License:__ GPLv2 or later
__License URI:__ http://www.gnu.org/licenses/gpl-2.0.html

<<<<<<< Updated upstream
#### :pushpin: Please note:
It’s important to install the official Gutenberg plugin in combination with the Aino blocks plugin, since we are working with the group block which is currently not yet published as a core plugin, but will be in the next WordPress update.

## Changelog
=======

### 0.0.2
New: Advanced Button Block
Expand Down