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

Fix korebuild-lock.txt

This commit is contained in:
Justin Kotalik 2018-07-30 13:59:06 -07:00 committed by GitHub
parent 8f10ccff89
commit 23783e4dba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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-10015 version:3.0.0-alpha1-10015
commithash:3f36e5c2f061712f76f2766c435d2555681d5c55 commithash:3f36e5c2f061712f76f2766c435d2555681d5c55
=======
version:2.2.0-preview1-17102
commithash:e7e2b5a97ca92cfc6acc4def534cb0901a6d1eb9
>>>>>>> merge/release/2.2-to-master