Closed killajoe closed 5 years ago
@killajoe Could you fix merge conflicts?
[Merge pull request](/Antergos/antergos-packages/pull/434/commits/bf1f971977adac94db3d581aff7bdcf136f955c2) #1 [from Antergos/master](/Antergos/antergos-packages/pull/434/commits/bf1f971977adac94db3d581aff7bdcf136f955c2) …
[Merge pull request](/Antergos/antergos-packages/pull/434/commits/bf1f971977adac94db3d581aff7bdcf136f955c2) #1 [from Antergos/master](/Antergos/antergos-packages/pull/434/commits/bf1f971977adac94db3d581aff7bdcf136f955c2)
or i do again do not understand how github is working ...?
@killajoe Could you fix merge conflicts?