huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bad korebuild-lock file

This commit is contained in:
Justin Kotalik 2018-09-27 12:42:01 -07:00
parent 4eb9fc05a3
commit c0de15cc45
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
korebuild-lock.txt
View File

@ -1,7 +1,2 @@
<<<<<<< HEAD
version:3.0.0-alpha1-20180919.1 version:3.0.0-alpha1-20180919.1
commithash:3066ae0a230870ea07e3f132605b5e5493f8bbd4 commithash:3066ae0a230870ea07e3f132605b5e5493f8bbd4
=======
version:2.2.0-preview1-20180918.1
commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800
>>>>>>> merge/release/2.2-to-master