Skip to content

John b #1

Merged
merged 2 commits into from
Feb 9, 2015
Merged

John b #1

merged 2 commits into from
Feb 9, 2015

Conversation

wkc12001
Copy link
Collaborator

@wkc12001 wkc12001 commented Feb 9, 2015

Pulling will allow me to copy files from one branch over to mine right?

john added 2 commits February 8, 2015 21:44
- Class: RPGame
	- inventoryFromFile()
		- reads from inventory.txt for the merchants' inventory
- Test: TestRPGame
	- Tests that all data was read and saved properly from RPGame

Changed:
- Class: Merchant
	- Renamed some methods and variables from randomPrice to
randomPercentage as discussed in our meeting
@john
Copy link
Collaborator

john commented Feb 9, 2015

Yes, I think so

john added a commit that referenced this pull request Feb 9, 2015
@john john merged commit 72981cd into William-C Feb 9, 2015
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants