Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Remove left-over conflict marker from the FreeBSD definition file. #164

Merged
merged 1 commit into from Nov 25, 2011

Conversation

Projects
None yet
2 participants
Contributor

kalbasit commented Nov 17, 2011

No description provided.

jedi4ever added a commit that referenced this pull request Nov 25, 2011

Merge pull request #164 from eMxyzptlk/patch-1
Remove left-over conflict marker from the FreeBSD definition file.

@jedi4ever jedi4ever merged commit 4f0259d into jedi4ever:master Nov 25, 2011

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment