mirror of
https://gitee.com/dotnetchina/OpenAuth.Net.git
synced 2026-07-28 06:07:59 +08:00
#810: 解决冲突
This commit is contained in:
Submodule commit.ref updated: f6b7ba8b88...329c2c9f07
43
commit.yml
43
commit.yml
@@ -1,44 +1,9 @@
|
||||
!revision
|
||||
branches: {
|
||||
}
|
||||
fileChange:
|
||||
/OpenAuth.App:
|
||||
newFile: !uuid '94b20152ba3c05b739a842262da4170ee2c945f2'
|
||||
oldFile: !uuid '36eab2f198f4a96f861977d97ab5f714408e61ff'
|
||||
/OpenAuth.App/Test:
|
||||
newFile: !uuid 'e6f0367d545382df5b753dbd6697093efd9b5ce5'
|
||||
oldFile: !uuid 'c269a40934d4ec7acf8d470ee9346f8418cdafe8'
|
||||
/OpenAuth.App/Test/TestBase.cs:
|
||||
newFile: !uuid 'ac3902d956b0cb060dd88c41891b9b9b88c02cef'
|
||||
oldFile: !uuid '0614968dbe4b41eacc3342e8ab2af9c5f88307b4'
|
||||
/OpenAuth.Identity:
|
||||
newFile: !uuid '7d1eca514fa465a02ead109c701517f3d264d314'
|
||||
oldFile: !uuid '1ae79a25b92cbaea207fee3a9d850e39c2407da8'
|
||||
/OpenAuth.Identity/Startup.cs:
|
||||
newFile: !uuid '341b2e792b845fbd10f71fded35ef26f88585f9f'
|
||||
oldFile: !uuid 'a70da298a9c3599eea6ec6a9178b781843e367d1'
|
||||
/OpenAuth.Mvc:
|
||||
newFile: !uuid '9a1d30e8c1ac95d064ad0a5febb68cbfc7c9b02f'
|
||||
oldFile: !uuid '5966cf6474e504d4318a49330231050f414cbaaf'
|
||||
/OpenAuth.Mvc/Startup.cs:
|
||||
newFile: !uuid '78611723bc026e0faa23d3f0d50a6459e63b8e98'
|
||||
oldFile: !uuid '45576afb3c29e9c7a151a79758be2a4174a27060'
|
||||
/OpenAuth.Repository:
|
||||
newFile: !uuid '3fc10e5389ed83b0ee684f23e48ecc41072730cd'
|
||||
oldFile: !uuid '68f7503c3ed050f49731ae9a5fab380fe9a90c17'
|
||||
/OpenAuth.Repository/Test:
|
||||
newFile: !uuid 'e12c440ca7376576c55d492f495458abd4604d71'
|
||||
oldFile: !uuid 'feefb56df94388645887e3303c3b07dbc50eaa24'
|
||||
/OpenAuth.Repository/Test/TestBase.cs:
|
||||
newFile: !uuid '714c6813bd93431f1c29beeeaeb6c1496dcf7bd9'
|
||||
oldFile: !uuid '93dd2a724e5c97459d59d8d9ebe5f5cf60322cfe'
|
||||
/OpenAuth.WebApi:
|
||||
newFile: !uuid '102eeec3f6bda3438fd079e4e918a24bc795ea59'
|
||||
oldFile: !uuid '4137737aeee18ffde2226d7131e39f5aade2dd7f'
|
||||
/OpenAuth.WebApi/Startup.cs:
|
||||
newFile: !uuid '731b23b0e4869ce46fafb25b38ec6367dd90e267'
|
||||
oldFile: !uuid '46c05d32a6d8f79597b9b445b69f10a69346d64d'
|
||||
gitCommitId: !uuid 'f6b7ba8b88dd2b9e5a9e4d980ca40bbd5cd22114'
|
||||
fileChange: {
|
||||
}
|
||||
gitCommitId: !uuid '329c2c9f0709a6985014b90bb958830e26dc2a68'
|
||||
renames: {
|
||||
}
|
||||
revisionId: 809
|
||||
revisionId: 810
|
||||
|
||||
Reference in New Issue
Block a user