Skip to content

Commit

Permalink
Solve workflow conflict
Browse files Browse the repository at this point in the history
Solve workflow conflict from master-2.x and master
  • Loading branch information
superboyiii authored Jul 17, 2020
1 parent dcd946a commit 85fad82
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
name: .NET Core Test and Publish

on: pull_request

on:
push:
branches: master
pull_request:

env:
DOTNET_VERSION: 3.1.100

Expand Down

0 comments on commit 85fad82

Please sign in to comment.