File tree Expand file tree Collapse file tree 1 file changed +0
-4
lines changed Expand file tree Collapse file tree 1 file changed +0
-4
lines changed Original file line number Diff line number Diff line change 1
1
# phpList core module
2
2
3
3
4
- <<<<<<< HEAD
5
4
[ ![ Build Status] ( https://github.com/phpList/core/workflows/phpList%20Core%20Build/badge.svg )] ( https://github.com/phpList/core/actions )
6
- =======
7
- [ ![ Build Status] ( https://github.com/phpList/core/workflows/phpList%20Build/badge.svg )] ( https://github.com/phpList/web-frontend/actions )
8
- >>>>>>> f6596fe9bfb52b9b788084880b7b88dd7758c4ed
9
5
[ ![ Latest Stable Version] ( https://poser.pugx.org/phplist/core/v/stable.svg )] ( https://packagist.org/packages/phpList/core )
10
6
[ ![ Total Downloads] ( https://poser.pugx.org/phplist/core/downloads.svg )] ( https://packagist.org/packages/phpList/core )
11
7
[ ![ Latest Unstable Version] ( https://poser.pugx.org/phplist/core/v/unstable.svg )] ( https://packagist.org/packages/phpList/core )
You can’t perform that action at this time.
0 commit comments