diff options
| author | Guang Ya Liu <gyliu513@gmail.com> | 2017-04-25 11:46:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 11:46:25 +0800 |
| commit | 4bb2616dd548d87f501fbfab228952047bc7194e (patch) | |
| tree | bb84879220133ab8bf143b794eb785279d8c60ac | |
| parent | 0eacd5d92c00c8643f2e1d7930e150f8336617fd (diff) | |
| parent | 3d84c671e694db0b83353ad27d3b69bb001d2c20 (diff) | |
Merge pull request #572 from aslakknutsen/patch-1
Fix broken link to strategic-merge in api-conventions.md
| -rw-r--r-- | contributors/devel/api-conventions.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contributors/devel/api-conventions.md b/contributors/devel/api-conventions.md index c00776f4..898fb3a1 100644 --- a/contributors/devel/api-conventions.md +++ b/contributors/devel/api-conventions.md @@ -550,7 +550,7 @@ below. #### Strategic Merge Patch -Details of Strategic Merge Patch are covered [here](../strategic-merge-patch.md). +Details of Strategic Merge Patch are covered [here](strategic-merge-patch.md). ## Idempotency |