From 8de776dd4948921194c6c2ffeec672eb3b732464 Mon Sep 17 00:00:00 2001 From: Patrick Alexander Date: Wed, 2 Dec 2015 16:59:52 -0700 Subject: [PATCH] fixed merge conflict --- knowledge-base/user-guides/index.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/knowledge-base/user-guides/index.md b/knowledge-base/user-guides/index.md index ad865049..e7e7a286 100644 --- a/knowledge-base/user-guides/index.md +++ b/knowledge-base/user-guides/index.md @@ -11,10 +11,10 @@ attribution: "