wip

2020-05-04 12:03:45 -04:00 · 2020-05-04 12:03:45 -04:00 · 27ed39e553
parent 4a9e387613
commit 27ed39e553
1 changed files with 0 additions and 11 deletions
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -1,18 +1,7 @@
-<<<<<<< HEAD
-# Maven
-
-=======
->>>>>>> 18b5b3b16654f9f583227bddce9ea209a64aa47f
 trigger:
  branches:
    include:
      - '*'
-<<<<<<< HEAD
-  # pr:
-  # - master
-  # - release
-=======
->>>>>>> 18b5b3b16654f9f583227bddce9ea209a64aa47f

 strategy:
  matrix: