fix merge issues from powershell additions

mugun · Apr 21, 2016 · 28b6165 · 28b6165
1 parent d6e7230
commit 28b6165
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/test/markup/cpp/function-title.expect.txt b/test/markup/cpp/function-title.expect.txt
@@ -6,6 +6,4 @@
   <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> (a-&gt;check2())
     <span class="hljs-keyword">return</span> <span class="hljs-number">4</span>;
   <span class="hljs-keyword">return</span> a-&gt;result();
-    return <span class="hljs-number">4</span>;
-  return a-&gt;result();
-}
+}