Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

urgh missed conflict marker

This commit is contained in:
Tim Becker 2012-03-10 15:09:37 +01:00
parent 2112ccbe24
commit 94550a0d57
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -60,7 +60,4 @@ ARCH.*
avocsh avocsh
libavocado.a libavocado.a
*.swp *.swp
<<<<<<< Updated upstream
tags tags
=======
>>>>>>> Stashed changes