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

Oops...still conflicted

This commit is contained in:
Andreas Streichardt 2016-04-04 15:45:30 +02:00
parent 675ccf06f9
commit a2b8bb92f2
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Agency/Store.cpp
View File

@ -637,10 +637,6 @@ void Store::clearTimeTable () {
break;
}
}
<<<<<<< HEAD
=======
>>>>>>> 5caf02768c711fe1d811bb58d5451f86ac38b02f
}