Skip to content

2 find stocks solution#1

Open
cjwimmer1975 wants to merge 13 commits intomasterfrom
2_FindStocks_Solution
Open

2 find stocks solution#1
cjwimmer1975 wants to merge 13 commits intomasterfrom
2_FindStocks_Solution

Conversation

@cjwimmer1975
Copy link
Copy Markdown

No description provided.

Conflicts:

	source/StockTicker.Test/StockTicker.Test.csproj
Conflicts:
	source/StockTicker.Test/StockTicker.Test.csproj
	source/StockTicker/GlobalSuppressions.cs
	source/StockTicker/StockTicker.csproj
(cherry picked from commit 09fca4c)
Fixed package problems because of excludeversion
(cherry picked from commit 96799b0)
Conflicts:
	source/StockTicker.Test/Authentication/ChoosePasswordViewModelTest.cs
	source/StockTicker.Test/Authentication/ChooseUserNameViewModelTest.cs
Conflicts:
	source/StockTicker/Authentication/AuthenticationView.xaml
	source/StockTicker/Authentication/ChoosePasswordView.xaml
	source/StockTicker/Authentication/ChooseUserNameView.xaml
	source/StockTicker/ManageStocks/StockDetailView.xaml
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.

2 participants