jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-01 19:13:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix Conflicts

Browse source
This commit is contained in:
Jeff 2015-08-20 22:27:46 -04:00
parent e9bad2cacb
commit 05f2bc8392
3 changed files with 5 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/tab_game.h
View file

@ -204,12 +204,10 @@ private slots:
void addMentionTag(QString value);
void commandFinished(const Response &response);
<<<<<<< HEAD
void actCompleterChanged();
=======
void refreshShortcuts();
>>>>>>> master
void actCompleterChanged();
public:
TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_clients, const Event_GameJoined &event, const QMap<int, QString> &_roomGameTypes);
TabGame(TabSupervisor *_tabSupervisor, GameReplay *replay);