Stacktrek-Training / stack-ilearning

1 stars 12 forks source link

Rene/add-game-and-setup-db #28

Closed calaorrene closed 1 year ago

iceniveth commented 1 year ago

Please resolve these merge conflicts: https://github.com/Stacktrek-Training/stack-ilearning/pull/28/conflicts

It'll show up when executing git pull origin main. Before executing make sure your local changes are already committed.