Fixed wrong merge

PissedCapslock · Feb 21, 2020 · 556d24c · 556d24c
1 parent 015813e
commit 556d24c
Showing 1 changed file with 0 additions and 61 deletions.
diff --git a/src/default/partials/type.hbs b/src/default/partials/type.hbs
@@ -144,66 +144,6 @@ if an inner type may result in invalid output without them. For example:
             {{/each}}
             <span class="tsd-signature-symbol"> }</span>
         {{else}}
-<<<<<<< HEAD
-            {{#if types}}
-                {{#each types}}
-                    {{#if @index}}
-                        <span class="tsd-signature-symbol"> {{#ifCond ../type '==' 'intersection'}}&amp;{{else}}|{{/ifCond}} </span>
-                    {{/if}}{{> type}}
-                {{/each}}
-            {{else}}
-                {{#if elements}}
-                    {{#compact}}
-                        <span class="tsd-signature-symbol">[</span>
-
-                        {{#each elements}}
-                            {{#if @index}}
-                                <span class="tsd-signature-symbol">, </span>
-                            {{/if}}{{> type}}
-                        {{/each}}
-
-                        <span class="tsd-signature-symbol">]</span>
-                    {{/compact}}
-                {{else}}
-                    {{#ifCond type '===' 'predicate'}}
-                        {{#compact}}
-                            {{#if asserts}}
-                                <span class="tsd-signature-symbol">asserts</span>
-                            {{/if}}
-                            <span class="tsd-signature-type">{{name}}</span>
-                            {{#if targetType}}
-                                <span class="tsd-signature-symbol"> is </span>
-                                {{#with targetType}}
-                                    {{>type}}
-                                {{/with}}
-                            {{/if}}
-                        {{/compact}}
-                    {{else}}
-                        {{#compact}}
-                            <span class="tsd-signature-type">
-                                {{#if name}}
-                                    {{formatDisplayName name}}
-                                {{else if value}}
-                                    "{{value}}"
-                                {{else}}
-                                    {{this}}
-                                {{/if}}
-                            </span>
-                            {{#if typeArguments}}
-                                <span class="tsd-signature-symbol">&lt;</span>
-
-                                {{#each typeArguments}}
-                                    {{#if @index}}
-                                        <span class="tsd-signature-symbol">, </span>
-                                    {{/if}}{{> type}}
-                                {{/each}}
-
-                                <span class="tsd-signature-symbol">&gt;</span>
-                            {{/if}}
-                        {{/compact}}
-                    {{/ifCond}}
-                {{/if}}
-=======
             {{#if needsParens}}
                 <span class="tsd-signature-symbol">(</span>
             {{/if}}
@@ -212,7 +152,6 @@ if an inner type may result in invalid output without them. For example:
             {{/with}}
             {{#if needsParens}}
                 <span class="tsd-signature-symbol">)</span>
->>>>>>> upstream/master
             {{/if}}
         {{/if}}
     {{else}}