diff options
| author | John Josef <john.josef@gmail.com> | 2013-09-08 18:31:56 -0400 |
|---|---|---|
| committer | John Josef <john.josef@gmail.com> | 2013-09-08 18:31:56 -0400 |
| commit | 917e5fa9a18b42bb00140db9112e362bc810aa45 (patch) | |
| tree | 644affa16c06d9c2cbdc3dbe03177faad75efa38 /include/git2/merge.h | |
| parent | ef6389ad504037e7a4311adbf14f1fa5a5aa4190 (diff) | |
| download | libgit2-917e5fa9a18b42bb00140db9112e362bc810aa45.tar.gz | |
fixes issues with objective-git
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index cef6f775b..3f21fb4c8 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -7,11 +7,11 @@ #ifndef INCLUDE_git_merge_h__ #define INCLUDE_git_merge_h__ -#include "git2/common.h" -#include "git2/types.h" -#include "git2/oid.h" -#include "git2/checkout.h" -#include "git2/index.h" +#include "common.h" +#include "types.h" +#include "oid.h" +#include "checkout.h" +#include "index.h" /** * @file git2/merge.h |