From 27ed39e553f88097f13957ac1b29404fc42a7f76 Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Mon, 4 May 2020 12:03:45 -0400
Subject: [PATCH] wip

---
 azure-pipelines.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b634d024b..236ae4e27 100644
--- 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: