Skip to content
Snippets Groups Projects
Commit 360a2656 authored by mtarnow's avatar mtarnow
Browse files

Merge branch '36-implement-deck-class-in-common' of...

Merge branch '36-implement-deck-class-in-common' of gitlab.ethz.ch:beckermar/wizard into 36-implement-deck-class-in-common
parents 1229a306 23d09c00
No related branches found
No related tags found
2 merge requests!17finalize common,!12Resolve "implement deck class in common"
......@@ -82,7 +82,7 @@ bool hand::remove_card(std::string card_id, card*& played_card, std::string &err
return false;
}
}
#endif
//#endif
void hand::write_into_json(rapidjson::Value &json, rapidjson::Document::AllocatorType& allocator) const {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment