Skip to content

Commit

Permalink
Fix merge conflict on CHANGELOG.md
Browse files Browse the repository at this point in the history
  • Loading branch information
Corina committed Jun 3, 2019
2 parents 834b6e1 + 7c3f47b commit e7b791d
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 34 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fix [#1736](https://github.com/Microsoft/BotFramework-WebChat/issues/1736). Fixed only first activity in a batch is spoken, by [@compulim](https://github.com/compulim) in PR [#2016](https://github.com/Microsoft/BotFramework-WebChat/pull/2016)
- Fix [#2008](https://github.com/Microsoft/BotFramework-WebChat/issues/2008). Fixed playground due to recent eslint changes, by [@compulim](https://github.com/compulim) in PR [#2009](https://github.com/Microsoft/BotFramework-WebChat/pull/2009)
- Fix [#1876](https://github.com/Microsoft/BotFramework-WebChat/issues/1876). Accessibility fixes on Web Chat transcript, by [@corinagum](https://github.com/corinagum) in PR [#2018](https://github.com/Microsoft/BotFramework-WebChat/pull/2018)
- Fix [#1829](https://github.com/microsoft/BotFramework-WebChat/issues/1829). Fixed long text not being synthesized by Cognitive Services by bumping to [`react-say@1.2.0`](https://github.com/compulim/react-say), by [@compulim](https://github.com/compulim) in PR [#2035](https://github.com/Microsoft/BotFramework-WebChat/pull/2035)
- Fix [#1982](https://github.com/Microsoft/BotFramework-WebChat/issues/1982). Move to prettier! by [@corinagum](https://github.com/corinagum) in PR [#2038](https://github.com/Microsoft/BotFramework-WebChat/pull/2038)

## [4.4.1] - 2019-05-02
Expand Down
33 changes: 22 additions & 11 deletions packages/component/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"react-dictate-button": "^1.1.3",
"react-film": "1.2.1-master.db29968",
"react-redux": "^5.0.7",
"react-say": "^1.1.2-master.453bced",
"react-say": "^1.2.0",
"react-scroll-to-bottom": "~1.3.1",
"redux": "^4.0.0",
"sanitize-html": "^1.18.2",
Expand Down
18 changes: 0 additions & 18 deletions packages/playground/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion packages/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"react-dictate-button": "1.1.3-master.97bc9a2",
"react-dom": "^16.4.1",
"react-redux": "^5.0.7",
"react-say": "1.1.2-master.453bced",
"react-scripts": "^3.0.0",
"redux": "^4.0.0",
"rxjs": "5",
Expand Down
8 changes: 5 additions & 3 deletions scripts/PushBitsToGithub.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ param
(
[string]$newFilesPath, #"$(System.ArtifactsDirectory)/pages"
[string]$branchName, #gh-pages
[string]$repoRootPath #"$(Build.SourcesFolder)"
[string]$repoRootPath, #"$(Build.SourcesDirectory)"
[string]$repoUserName, #"NameOfUser"
[string]$repoUserEmail #"user@domain.com"
)

Set-Location -Path $repoRootPath

# Set default identity
git config --global user.email "v-bruhal@micrsoft.com"
git config --global user.name "BruceHaley"
git config --global user.email $repoUserEmail
git config --global user.name $repoUserName

# Preserve line endings (presumably LF)
git config --global core.autocrlf input
Expand Down

0 comments on commit e7b791d

Please sign in to comment.