diff --git a/doc/import_external_docs.ps1 b/doc/import_external_docs.ps1 index b2cc2617d6f4..2f64dbcc98ba 100644 --- a/doc/import_external_docs.ps1 +++ b/doc/import_external_docs.ps1 @@ -7,39 +7,17 @@ Set-PSDebug -Trace 1 $external_docs = @{ # use either commit, or branch name to use its latest commit -<<<<<<< HEAD -<<<<<<< HEAD - "uno.wasm.bootstrap" = "6a034bdd23a8be6882b0d05e8b017e49f655e89d" #latest main commit - "uno.themes" = "38d6bf005a2637f77bb052d92be88ac567479811" #latest release branch commit - "uno.toolkit.ui" = "27c6e65094a8e9a53e6a4f33b846f4d98c118fc4" #latest release branch commit - "uno.check" = "27a06fd34c4744d07d48249daae1bcdf21a8a005" #latest main commit - "uno.xamlmerge.task" = "21f02c98702b875a9942047ca042e41810b6fe56" #latest main commit -======= - "uno.wasm.bootstrap" = "69dd0ead0c99cc11f559d44cb67f20fa215de316" #latest main commit -======= "uno.wasm.bootstrap" = "abcb066159e3a089019032fbd4befda836336296" #latest release/stable/8.0 branch commit ->>>>>>> 510546bd74 (chore: Restore bootstrapper update) "uno.themes" = "1da7240824a1bc5ddaf5efc1ed6e22ea5a41abd9" #latest release/stable/5.2 branch commit "uno.toolkit.ui" = "a79e83cb260c17f59be6a843ce90038cb2479a61" #latest release/stable/6.2 branch commit "uno.check" = "27e686d9205654375fd2c7861c3ebe5f2ad69e93" #latest main commit "uno.xamlmerge.task" = "74c832124dad9a979f8d6318b6c18be1125467e5" #latest main commit ->>>>>>> 283215aab8 (docs: Update documentation with latest updates) "figma-docs" = "842a2792282b88586a337381b2b3786e779973b4" #latest main commit "uno.resizetizer" = "b17e1d54f4375f79da24ae5eaaf3f738851786eb" #latest main commit "uno.uitest" = "9669fd2783187d06c36dd6a717c1b9f08d1fa29c" #latest master commit -<<<<<<< HEAD - "uno.extensions" = "3cdb9fc1dba989986413b563fdaaf07bd88c31f1" #latest release branch commit - "workshops" = "df05737f9e3088a4e60179f6fa2cd2fc6866d2c7" #latest master commit - "uno.samples" = "d30313f954c312563a118196b734a534718eceb9" #latest master commit -======= "uno.extensions" = "f2871cf4aa93bce96d8a19ede2b1417776589093" #latest release/stable/5.0 branch commit "workshops" = "e3c2a11a588b184d8cd3a6f88813e5615cca891d" #latest master commit -<<<<<<< HEAD - "uno.samples" = "ef30b74b84bd470521ae1383b49ced4afcfeab1d" #latest master commit ->>>>>>> 283215aab8 (docs: Update documentation with latest updates) -======= "uno.samples" = "cf96230ed902e18335411683cb07321eae125df2" #latest master commit ->>>>>>> 53b792eb9c (docs: Update Uno.Samples documentation with latest changes) } $uno_git_url = "https://github.com/unoplatform/"