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

Fixed a conflict marker in the .gitignore file #50

Merged
merged 1 commit into from Nov 27, 2012

Conversation

Projects
None yet
2 participants

No description provided.

nornagon added a commit that referenced this pull request Nov 27, 2012

Merge pull request #50 from sbermeister/master
Fixed a conflict marker in the .gitignore file

@nornagon nornagon merged commit e37282e into googlearchive:master Nov 27, 2012

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