Skip to content

Commit 232d5c8

Browse files
committed
Fixes to merge conflicts
1 parent 979a75c commit 232d5c8

File tree

1 file changed

+0
-60
lines changed

1 file changed

+0
-60
lines changed

launcher-csharp/Views/Home/Index.cshtml

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@
3939

4040
<h4 id="example002">2. <a href="eg002">Send an envelope with a remote (email) signer and cc recipient</a></h4>
4141
<p>
42-
<<<<<<< HEAD
43-
The envelope includes a pdf, Word, and HTML document. Anchor text
44-
=======
4542
The envelope includes three documents: one each in PDF, Word, and HTML format. Anchor text
46-
>>>>>>> becb224 (Matt edits to index files)
4743
(<a target='_blank' href="https://developers.docusign.com/docs/esign-rest-api/esign101/concepts/tabs/auto-place/">AutoPlace</a>)
4844
is used to position the signing fields in the documents.
4945
</p>
@@ -104,11 +100,7 @@
104100
<p>This example creates a template with two roles, <b>signer</b> and <b>cc</b>.</p>
105101
<p>
106102
API methods used:
107-
<<<<<<< HEAD
108-
<a target='_blank' href="https://developers.docusign.com/docs/esign-rest-api/reference/templates/templates/list/">Templates::list</a>,
109-
=======
110103
<a target='_blank' href="https://developers.docusign.com/docs/esign-rest-api/reference/templates/templates/list/">Templates::list</a> and
111-
>>>>>>> becb224 (Matt edits to index files)
112104
<a target='_blank' href="https://developers.docusign.com/docs/esign-rest-api/reference/templates/templates/create/">Templates::create</a>.
113105
</p>
114106

@@ -149,18 +141,8 @@
149141
<a target='_blank' href="https://developers.docusign.com/docs/esign-rest-api/reference/envelopes/envelopeviews/createconsole/">EnvelopeViews::createConsole</a>.
150142
</p>
151143

152-
<<<<<<< HEAD
153-
<h4 id="example013">13. <a href="eg013">Embedded Signing Ceremony from a template with an added document</a></h4>
154-
<p>This example sends an envelope based on a template.</p>
155-
<p>
156-
In addition to the template's document(s), the example adds an
157-
additional document to the envelope by using the
158-
<a target='_blank' href='https://developers.docusign.com/docs/esign-rest-api/esign101/concepts/templates/composite/'>Composite Templates</a>
159-
feature.
160-
=======
161144
<h4 id="example013">13. <a href="eg013">Use embedded signing from a template with an added document</a></h4>
162145
<p>This example sends an envelope based on a template. In addition to the template's document(s), the example adds an additional document to the envelope by using the <a target='_blank' href='https://developers.docusign.com/docs/esign-rest-api/esign101/concepts/templates/composite/'>Composite Templates</a> feature.
163-
>>>>>>> becb224 (Matt edits to index files)
164146
</p>
165147
<p>
166148
API methods used:
@@ -170,14 +152,7 @@
170152

171153
<h2>Payments Example</h2>
172154
<h4 id="example014">14. <a href="eg014">Send an envelope with an order form and payment field</a></h4>
173-
<<<<<<< HEAD
174-
<p>
175-
Anchor text
176-
(<a target='_blank' href="https://developers.docusign.com/docs/esign-rest-api/esign101/concepts/tabs/auto-place/">AutoPlace</a>)
177-
is used to position the fields in the documents.
178-
=======
179155
<p>Anchor text (<a target='_blank' href="https://developers.docusign.com/docs/esign-rest-api/esign101/concepts/tabs/auto-place/">AutoPlace</a>) is used to position the fields in the documents.
180-
>>>>>>> becb224 (Matt edits to index files)
181156
</p>
182157
<p>
183158
API method used:
@@ -188,13 +163,9 @@
188163

189164
<h2>Tabs examples</h2>
190165
<h4 id="example015">15. <a href="eg015">Get the tab data from an envelope</a></h4>
191-
<<<<<<< HEAD
192-
<p>This example retrieves the <strong>tab</strong> (<a target="_blank" href="https://developers.docusign.com/docs/esign-rest-api/esign101/concepts/tabs/">field</a>) values from an envelope.</p>
193-
=======
194166
<p>This example retrieves the <a target="_blank"
195167
href="https://developers.docusign.com/docs/esign-rest-api/esign101/concepts/tabs/">tab</a> (field) values from an
196168
envelope.</p>
197-
>>>>>>> becb224 (Matt edits to index files)
198169
<p>
199170
API method used:
200171
<a target='_blank' href="https://developers.docusign.com/docs/esign-rest-api/reference/envelopes/envelopeformdata/get/">EnvelopeFormData::get</a>.
@@ -205,31 +176,21 @@
205176
href="https://developers.docusign.com/docs/esign-rest-api/esign101/concepts/tabs/">tab</a> (field) values for an
206177
envelope, including tabs that can and cannot be changed by the signer.</p>
207178
<p>
208-
<<<<<<< HEAD
209-
API method used:
210-
<a target='_blank' href="https://developers.docusign.com/docs/esign-rest-api/reference/envelopes/envelopes/create/">Envelopes::create</a>.
211-
=======
212179
API methods used:
213180
<a target='_blank' href="https://developers.docusign.com/docs/esign-rest-api/reference/envelopes/envelopes/create/">Envelopes::create</a> and
214181
<a target ='_blank' href="https://developers.docusign.com/docs/esign-rest-api/reference/envelopes/envelopeviews/createrecipient/">EnvelopeViews::createRecipient</a>.
215-
>>>>>>> becb224 (Matt edits to index files)
216182
</p>
217183

218184
<h4 id="example017">17. <a href="eg017">Set template tab values</a></h4>
219185
<p>This example sets the <a target="_blank"
220186
href="https://developers.docusign.com/docs/esign-rest-api/esign101/concepts/tabs/">tab</a> (field) values for a template being used by an envelope. It includes setting radio button and checkbox tabs.</p>
221187
<p>
222-
<<<<<<< HEAD
223-
API method used:
224-
<a target='_blank' href="https://developers.docusign.com/docs/esign-rest-api/reference/envelopes/envelopes/create/">Envelopes::create</a>.
225-
=======
226188
API methods used:
227189
<a target='_blank'
228190
href="https://developers.docusign.com/docs/esign-rest-api/reference/envelopes/envelopes/create/">Envelopes::create</a>
229191
and
230192
<a target='_blank'
231193
href="https://developers.docusign.com/docs/esign-rest-api/reference/envelopes/envelopeviews/createrecipient/">EnvelopeViews::createRecipient</a>.
232-
>>>>>>> becb224 (Matt edits to index files)
233194
</p>
234195

235196
<h4 id="example018">18. <a href="eg018">List envelope custom metadata field values</a></h4>
@@ -288,13 +249,8 @@
288249
This example sends an envelope requiring the recipient authenticate themselves by electronically presenting a government-issued identification (such as a passport, driver's license, or e-ID).
289250
</p>
290251
<p>
291-
<<<<<<< HEAD
292-
API method used:
293-
<a target='_blank' href="https://developers.docusign.com/docs/esign-rest-api/reference/envelopes/envelopes/create/">Envelopes::create</a>.
294-
=======
295252
API methods used:
296253
<a target ='_blank' href="https://developers.docusign.com/docs/esign-rest-api/reference/accounts/identityverifications/list/">Accounts::getAccountIdentityVerificationsList</a> and <a target ='_blank' href="https://developers.docusign.com/docs/esign-rest-api/reference/envelopes/envelopes/create/">Envelopes::create</a>.
297-
>>>>>>> becb224 (Matt edits to index files)
298254
</p>
299255

300256
<h2>Permissions</h2>
@@ -372,21 +328,6 @@
372328
</p>
373329

374330
<h2>Bulk operations</h2>
375-
<<<<<<< HEAD
376-
377-
<h4 id="example031">31. <a href="eg031">Bulk sending envelopes to multiple recipients</a></h4>
378-
379-
<p>
380-
Bulk sending envelopes to multiple recipients.
381-
</p>
382-
<p>
383-
API methods used:
384-
<a target="_blank" href="https://developers.docusign.com/docs/esign-rest-api/reference/envelopes/enveloperecipients/create/">EnvelopeRecipients::create</a>,
385-
<a target="_blank" href="https://developers.docusign.com/docs/esign-rest-api/reference/envelopes/envelopes/create/">Envelopes::create</a>,
386-
<a target="_blank" href="https://developers.docusign.com/esign-rest-api/reference/Envelopes/EnvelopeCustomFields/create">EnvelopeCustomFields::create</a>,
387-
<a target="_blank" href="https://developers.docusign.com/esign-rest-api/reference/BulkEnvelopes/BulkSend/createBulkSendList">BulkSend::createBulkSendList</a>.
388-
</p>
389-
=======
390331
<h4 id="example031">31. <a href="eg031">Bulk send envelopes</a></h4>
391332

392333
<p>
@@ -406,7 +347,6 @@
406347
<a target="_blank"
407348
href="https://developers.docusign.com/docs/esign-rest-api/reference/bulkenvelopes/bulksend/getbulksendbatchstatus/">BulkSend::getBulkSendBatchStatus</a>
408349
</p>
409-
>>>>>>> becb224 (Matt edits to index files)
410350

411351
<h2>Advanced recipient routing</h2>
412352

0 commit comments

Comments
 (0)