Fix merge conflicts

This commit is contained in:
Fabio Alessandro Locati 2014-10-13 19:05:54 +02:00
commit 8536ea2859
2 changed files with 2 additions and 0 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
asio-1.4.1.tar.gz
/asio-1.4.8.tar.bz2
/asio-00cdf672654fda984b0c57218eaf77845ad4167a.tar.gz
/asio-581fe686293be42260800c54cf2ac33576f35497.tar.gz

View File

@ -1 +1,2 @@
c158ab8c9794426c771b4096d1eebb4d asio-00cdf672654fda984b0c57218eaf77845ad4167a.tar.gz
f5a930cb07430f9c1b07c0cf83bb9296 asio-581fe686293be42260800c54cf2ac33576f35497.tar.gz