Skip to content

pull request #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 64 commits into
base: master
Choose a base branch
from

Conversation

charnaexw
Copy link

There's some ruined code, but most of it should work. I didn't know where to put it so I'm just going to keep working in Scientiffic and then copy paste where ever it needs to go.

Bobbi-Z and others added 30 commits June 27, 2021 23:45
# Conflicts:
#	src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java
Merge pull request #1 from Professional-Coding-Developments/master
# Conflicts:
#	src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java
#	src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java
cannotsleep...
added static to the class in my code.
updated UML with char's chamges.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants