resolve merge conflict

iTwin · Dec 16, 2024 · e4a0a9d · e4a0a9d
1 parent c251ab0
commit e4a0a9d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/common/config/azure-pipelines/jobs/docs-build.yaml b/common/config/azure-pipelines/jobs/docs-build.yaml
@@ -115,11 +115,7 @@ jobs:
           useCurrentConnectorFrameworkDocsArtifact: ${{ parameters.useCurrentConnectorFrameworkDocsArtifact }}
 
       # Currently BeMetalsmith is an internal only tool
-<<<<<<< HEAD
-      - script: npm install @bentley/[email protected]
-=======
       - script: npm install @bentley/[email protected]
->>>>>>> 906f63a8b6 (Docs: workaround for typedoc issue #2802 (#7470))
         displayName: Install BeMetalsmith
         workingDirectory: ${{ parameters.workingDir }}