Skip to content
This repository has been archived by the owner on Feb 27, 2020. It is now read-only.

Commit

Permalink
Merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@praecipula
praecipula committed Feb 28, 2017
1 parent 3db3a1d commit 4ba0d02
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/templates/api_reference/resource.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,9 @@ familiarize yourself with the process as documented in the README.md found in th

parent-title: API Reference
title: <%= thisType %>
<<<<<<< HEAD
description: "Get documentation, references, and support for working with Asana <%= thisType %>"
_template: dev-page
_layout: default
=======
description:
_template: dev-api-reference
_layout: dev
>>>>>>> parent of 7c622ca... Modifications to align with generated Markdown file structure and new template that the static site team implemented


# Sidebar nav
Expand Down

0 comments on commit 4ba0d02

Please sign in to comment.