Skip to content
This repository has been 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

Conversation

xnkevinnguyen
Copy link
Contributor

Description:

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Limitations:

Please describe limitations of this PR

Testing:

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • Test A
  • Test B

Checklist:

  • My code follows the style guidelines of this project
  • My code has been formatted with npm run format and passes the checks in npm run check
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

andreamah and others added 4 commits April 16, 2020 15:08
* Add precision to input slider

* Fix inverse switch

* Refactor

* Switch default is false

* Modify precision value for cpx and clue

* Table of Contents for README (#349)

* Slideshow Backwards/Forwards Bug Fix (#350)

* slideshow nav fixed

* Fixed print() statements for CLUE display in debug mode (#351)

* fixed debug_user_code.py to capture print statements

* added starting and ending print statements

* new release note apr 21

* added a few fixes

Co-authored-by: Vandy Liu <33995460+vandyliu@users.noreply.github.com>
Co-authored-by: Andrea Mah <31675041+andreamah@users.noreply.github.com>
Co-authored-by: andreamah <andrea_mah22@hotmail.com>
@xnkevinnguyen xnkevinnguyen merged commit 1b8a7dd into dev Apr 22, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants