wip
This commit is contained in:
parent
4a9e387613
commit
27ed39e553
|
@ -1,18 +1,7 @@
|
||||||
<<<<<<< HEAD
|
|
||||||
# Maven
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> 18b5b3b16654f9f583227bddce9ea209a64aa47f
|
|
||||||
trigger:
|
trigger:
|
||||||
branches:
|
branches:
|
||||||
include:
|
include:
|
||||||
- '*'
|
- '*'
|
||||||
<<<<<<< HEAD
|
|
||||||
# pr:
|
|
||||||
# - master
|
|
||||||
# - release
|
|
||||||
=======
|
|
||||||
>>>>>>> 18b5b3b16654f9f583227bddce9ea209a64aa47f
|
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
|
Loading…
Reference in New Issue