Skip to content
This repository was archived by the owner on Dec 23, 2021. It is now read-only.

Fix merge conflict from dev to staging #363

Merged
merged 8 commits into from
Apr 22, 2020
Merged

Fix merge conflict from dev to staging #363

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9a1adc9
moved tarball files to clue dir (#333)
andreamah Apr 16, 2020
1f3023c
Merge pull request #339 from microsoft/dev
xnkevinnguyen Apr 18, 2020
242acdb
Minor update to production (#352)
xnkevinnguyen Apr 21, 2020
4d42d49
Fix merge conflicts for import
xnkevinnguyen Apr 21, 2020
32f3c79
Merge branch 'dev' into users/t-xunguy/fix-merge
xnkevinnguyen Apr 22, 2020
0dd1090
Merge branch 'dev' into users/t-xunguy/fix-merge
xnkevinnguyen Apr 22, 2020
b8cbd2e
Merge conflicts
xnkevinnguyen Apr 22, 2020
5fb6850
Fix other conflicts
xnkevinnguyen Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/latest_release_note.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ export const LATEST_RELEASE_NOTE = `<h1>Device Simulator Express Release Notes
</div>

<h2>📝 April 22, 2020</h2>

<h3>Changes:</h3>
<ul>
<li>Increased precision for certain sensors on the CLUE and CPX.</li>
Expand Down