Fix a merge conflict

5a9c3672 · Nick Thomas · c3707e8c · 5a9c3672
Commit 5a9c3672 authored May 05, 2017 by Nick Thomas
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/views/layouts/project.html.haml app/views/layouts/project.html.haml +1 -1

No files found.
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -8,7 +8,7 @@
  - if current_user
    :javascript
      window.uploads_path = "#{namespace_project_uploads_path project.namespace,project}";
-      window.preview_markdown_path = "#{preview_markdown_path}";
+      window.preview_markdown_path = "#{preview_markdown_path(project)}";

 - content_for :header_content do
  .js-dropdown-menu-projects