Solaire / GLC

Lightweight, console-based, tool which automatically detects installed games and displays them to the user.
GNU General Public License v3.0
16 stars 3 forks source link

Another omnibus pull request #40

Closed Nutzzz closed 2 years ago

Nutzzz commented 2 years ago
Solaire commented 2 years ago

Sorry for the hold up. Could you resolve the conflicts and I'll get it on master?

Nutzzz commented 2 years ago

No worries about the hold-up. Since there hasn't been any other changes, just resolve conflicts by using mine (or rather "theirs" from your point of view).

EDIT: In any event, I'm not sure how to get visibility into the conflicts since I don't have write access to this branch. EDIT 2: OK, it looks like I was able to resolve them.