diff --git a/doc/import_external_docs.ps1 b/doc/import_external_docs.ps1 index f0726dd0d753..4e1b04cc5125 100644 --- a/doc/import_external_docs.ps1 +++ b/doc/import_external_docs.ps1 @@ -7,9 +7,15 @@ Set-PSDebug -Trace 1 $external_docs = @{ # use either commit, or branch name to use its latest commit +<<<<<<< HEAD "uno.wasm.bootstrap" = "6a034bdd23a8be6882b0d05e8b017e49f655e89d" #latest main commit "uno.themes" = "38d6bf005a2637f77bb052d92be88ac567479811" #latest release branch commit "uno.toolkit.ui" = "27c6e65094a8e9a53e6a4f33b846f4d98c118fc4" #latest release branch commit +======= + "uno.wasm.bootstrap" = "abcb066159e3a089019032fbd4befda836336296" #latest main commit + "uno.themes" = "911af3ae03567841e01b47751fb13bbecfd7bebf" #latest release branch commit + "uno.toolkit.ui" = "9bb4e48504983634a96eb8314bfcc982d16a90fb" #latest release branch commit +>>>>>>> 7e76366392 (docs: Update Uno Themes documentation to latest) "uno.check" = "27a06fd34c4744d07d48249daae1bcdf21a8a005" #latest main commit "uno.xamlmerge.task" = "21f02c98702b875a9942047ca042e41810b6fe56" #latest main commit "figma-docs" = "842a2792282b88586a337381b2b3786e779973b4" #latest main commit