summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnderByEndera <[email protected]>2020-12-30 17:06:26 +0800
committerEnderByEndera <[email protected]>2020-12-30 17:06:26 +0800
commitd866c93152d9ee7dd2db7ce496c4e0d4433982af (patch)
tree4bc40686638b53be299cbdab0b2608e3e22124cc
parentf340a461c6805aec8778922819008b7c7f5d12be (diff)
merged build.yml
-rw-r--r--.workflow/build.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/.workflow/build.yml b/.workflow/build.yml
index 406148a..e93a646 100644
--- a/.workflow/build.yml
+++ b/.workflow/build.yml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
name: commdetection-build
displayName: 'Golang command-detection build'
triggers: