conflict resolved 2

apps/api/templates/_entity_class_property.html

@@ -1,12 +1,7 @@
 {% load markup %}
 
-<<<<<<< HEAD
-<p class="api-element-name" id="{{ class_doc.name }}_{{property.name }}">
-	<a title={{ property.name }} href="#{{ class_doc.name }}_{{property.name }}" class="api-name">{{ class_doc.name }}.{{ property.name }} : {{ property.property_type }}</a>
-=======
 <p class="api-element-name" id="{{ entity.name }}_{{property.name }}">
 	<a title={{ property.name }} href="#{{ entity.name }}_{{property.name }}" class="api-name">{{ entity.name }}.{{ property.name }} : {{ property.property_type }}</a>
->>>>>>> bug-611173-
 </p>
 
 {% if property.description %}

apps/api/templates/_entity_method.html

@@ -1,26 +1,18 @@
 {% load markup %}
 
-<<<<<<< HEAD
-<p class="api-element-name" id="{{ class_doc.name }}_{{method.name }}">
-<a title={{ method.name }} href="#{{ class_doc.name }}_{{method.name }}" class="api-name">{{ class_doc.name }}.{{ method.signature }}</a>
-=======
 <p class="api-element-name" id="{{ entity.name }}_{{method.name }}">
 <a title={{ method.name }} href="#{{ entity.name }}_{{method.name }}" class="api-name">{{ entity.name }}.{{ method.signature }}</a>
->>>>>>> bug-611173-
 </p>
 
 {% if method.description %}
 	<p>{{ method.description|markdown }}</p>
 {% endif %}
 
-<<<<<<< HEAD
-=======
 {% if method.returns.description %}
 	returns {{ method.returns.type }}
 	<p>{{ method.returns.description|markdown }}</p>
 {% endif %}
 
->>>>>>> bug-611173-
 <div class="class-parameter-list">
 {% for param in method.params %}
 	{% if forloop.first %}

apps/api/templates/_entity_parameter.html

@@ -3,11 +3,7 @@
 
 <div class="parameter">
 <p class="parameter-name">
-<<<<<<< HEAD
-	{{ param.name }} : {{ param.type }}
-=======
 	{{ param.name }} : <span class="data-type">{{ param.type }}</span>
->>>>>>> bug-611173-
 </p>
 
 <p>
@@ -23,11 +19,7 @@
 		{% endif %}
 		<dl>
 			<dt>
-<<<<<<< HEAD
-				{{ property.name }} : {{ property.type }}
-=======
 				{{ property.name }} : <span class="data-type">{{ property.type }}</span>
->>>>>>> bug-611173-
 			</dt>
 
 			<dd>

apps/api/templates/_object_contents.html

@@ -1,11 +1,6 @@
 <div class="object-contents">
-<<<<<<< HEAD
-{% if class_doc.constructors %}
-	{% for method in class_doc.constructors %}
-=======
 {% if entity.constructors %}
 	{% for method in entity.constructors %}
->>>>>>> bug-611173-
 		{% if forloop.first %}
 			<p class="api-header">
 				Constructors</p>
@@ -14,27 +9,17 @@
 	{% endfor %}
 {% endif %}
 
-<<<<<<< HEAD
-{% if class_doc.methods %}
-	{% for method in class_doc.methods %}
-=======
 {% if entity.methods %}
 	{% for method in entity.methods %}
->>>>>>> bug-611173-
 		{% if forloop.first %}
 			<p class="api-header">Methods</p>
 		{% endif %}
 		{% include "_entity_method.html" %}
 	{% endfor %}
 {% endif %}
 
-<<<<<<< HEAD
-{% if class_doc.properties %}
-	{% for property in class_doc.properties %}
-=======
 {% if entity.properties %}
 	{% for property in entity.properties %}
->>>>>>> bug-611173-
 		{% if forloop.first %}
 			<p class="api-header">Properties</p>
 		{% endif %}

apps/api/templates/entity_class_doc.html

@@ -1,20 +1,11 @@
 {% load markup %}
 
-<<<<<<< HEAD
-<h3 class="UI_Heading" id="{{class_doc.name}}">
-<a title={{ class_doc.name }} href="#{{ class_doc.name }}" class="api-name">{{ class_doc.name }} object</a>
-</h3>
-
-{% if class_doc.description %}
-	<p>{{ class_doc.description|markdown}}</p>
-=======
 <h3 class="UI_Heading" id="{{entity.name}}">
 <a title={{ entity.name }} href="#{{ entity.name }}" class="api-name">{{ entity.name }} object</a>
 </h3>
 
 {% if entity.description %}
 	<p>{{ entity.description|markdown}}</p>
->>>>>>> bug-611173-
 {% endif %}
 
 {% include "_object_contents.html" %}

apps/api/templates/entity_function_doc.html

@@ -1,18 +1,5 @@
 {% load markup %}
 
-<<<<<<< HEAD
-<p class="api-name" id="{{function_doc.name}}">
-<a title={{ function_doc.name }} href="#{{ function_doc.name }}" class="api-name">{{ function_doc.signature }}</a>
-</p>
-
-
-{% if function_doc.description %}
-	<p>{{ function_doc.description|markdown}}</p>
-{% endif %}
-
-{% if function_doc.returns.description %}
-	returns {{ function_doc.returns.type }}
-=======
 {% if entity.signature %}
 <h3 class="UI_Heading" id="{{entity.name}}">
 <a title={{ entity.name }} href="#{{ entity.name }}" class="api-name">{{ entity.signature }}</a>
@@ -29,16 +16,11 @@ <h3 class="UI_Heading" id="{{entity.name}}">
 
 {% if entity.returns.description %}
 	returns {{ entity.returns.type }}
->>>>>>> bug-611173-
 	<p>{{ entity.returns.description|markdown }}</p>
 {% endif %}
 
 <div class="function-parameter-list">
-<<<<<<< HEAD
-{% for param in function_doc.params %}
-=======
 {% for param in entity.params %}
->>>>>>> bug-611173-
 	{% if forloop.first %}
 		<p class="api-element-header">Parameters</p>
 	{% endif %}

apps/api/templates/entity_property_doc.html

@@ -1,20 +1,11 @@
 {% load markup %}
 
-<<<<<<< HEAD
-<p class="api-name" id="{{property_doc.name}}">
-<a title={{ property_doc.name }} href="#{{ class_doc.name }}" class="api-name">{{ class_doc.name }} : {{ class_doc.property_type }}</a>
-</p>
-
-{% if class_doc.description %}
-	<p>{{ class_doc.description|markdown}}</p>
-=======
 <h3 class="UI_Heading" id="{{entity.name}}">
 <a title={{ entity.name }} href="#{{ entity.name }}" class="api-name">{{ entity.name }} : <span class="data-type">{{ entity.property_type }}</span></a>
 </h3>
 
 {% if entity.description %}
 	<p>{{ entity.description|markdown}}</p>
->>>>>>> bug-611173-
 {% endif %}
 
 {% include "_object_contents.html" %}

apps/api/templates/module_doc.html

@@ -5,31 +5,6 @@
 
 {% block app_content %}
 	<h1 class="UI_Heading">{{ module.name }}</h1>
-<<<<<<< HEAD
-
-	<div id="api-body">
-
-		<div class="UI_ModuleInfo markdown">
-			{{ module.info|markdown }}
-		</div>
-		<h2 class="UI_Heading">API Reference</h2>
-		{% for class_doc in module.classes %}
-			{% include "entity_class_doc.html" %}
-		{% endfor %}
-
-		{% for function_doc in module.functions %}
-			{% if forloop.first %}
-				 <h3 class="UI_Heading">Global Functions</h3>
-			{% endif %}
-			{% include "entity_function_doc.html" %}
-		{% endfor %}
-		{% for class_doc in module.properties %}
-			{% if forloop.first %}
-				 <h3 class="UI_Heading">Global Properties</h3>
-			{% endif %}
-			{% include "entity_property_doc.html" %}
-		{% endfor %}
-=======
 	<div id="api-body">
 
 {% for entity in module.entities %}
@@ -65,7 +40,6 @@ <h3 class="UI_Heading">Global Properties</h3>
 
 {% endfor %}
 
->>>>>>> bug-611173-
 	</div>
 
 {% endblock %}