Skip to content

Commit cd5db7c

Browse files
jiechen0826jiechen0826
committed
Test 2
1 parent afa0a10 commit cd5db7c

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
name: CI
2+
<<<<<<< HEAD
23
on:
34
push:
45
branches:
56
- jiechen3/github_runner
7+
=======
8+
on: # adding comment to trigger event 2
9+
>>>>>>> 7af37b94 (Test 2)
610
pull_request:
711
branches:
812
- jiechen3/github_runner

0 commit comments

Comments
 (0)