From 08909b49c84f7d71f08504dbaa9637360d06e36c Mon Sep 17 00:00:00 2001
From: Philippe Tillet <phil@openai.com>
Date: Sat, 6 Feb 2021 17:17:29 -0500
Subject: [PATCH] [CI] Fixed unmerged YAML file

---
 .ci/azure-pipelines.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
index 52767cfaa..91a825aab 100644
--- a/.ci/azure-pipelines.yml
+++ b/.ci/azure-pipelines.yml
@@ -1,18 +1,4 @@
-<<<<<<< HEAD
-# Python package
-# Create and test a Python package on multiple Python versions.
-# Add steps that analyze code, save the dist with the build record, publish to a PyPI-compatible index, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/languages/python
-
-
 name: Triton CI
-
-pr:
-- master
-
-=======
-name: Triton CI
->>>>>>> [CI] Updated trigger rule and status badge link
 pool:
   name: default