Skip to content

Commit 25bc341

Browse files
committed
Update README.md
1 parent 4de1240 commit 25bc341

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,15 @@
44
<h4>Dependencies</h4>
55
<p> Python 2.7 or later </p>
66
<h4>Requirements</h4>
7-
<<<<<<< HEAD
87
<p> Authentication requires a **Service URL**, a valid **Account Number** and **License Key**. Samples are coded to use the provided <em>credentials.py</em> sample that you will need to modify with your account information.</p>
98
<p>If you do not have an AvaTax account, a free trial account can be acquired through our [developer site](http://developer.avalara.com/api-get-started) </p>
10-
=======
119
<p> Authentication requires a valid <strong>Account Number</strong> and <strong>License Key</strong>, which should be entered in <em>each </em>of the sample requests that you would like to test.</p>
1210
<p>If you do not have an AvaTax account, a free trial account can be acquired through our <a href="http://developer.avalara.com/api-get-started">developer site</a> </p>
13-
>>>>>>> origin/master
1411
<p><strong>Samples Included</strong></p>
1512
<table>
1613
<tr>
17-
<td><div align="center"><strong>API</strong></div></td>
18-
<td><div align="center"><strong>Method Demonstrated</strong></div></td>
14+
<td width="176"><div align="center"><strong>API</strong></div></td>
15+
<td width="628"><div align="center"><strong>Method Demonstrated</strong></div></td>
1916
</tr>
2017
<tr>
2118
<td><strong>credentials.py</strong></td>
@@ -61,3 +58,4 @@
6158
<p>The <strong>Avalara AvaTax API Reference</strong> is located here: <a href="http://developer.avalara.com/api-docs/avalara-avatax-api-reference" target="_blank">http://developer.avalara.com/api-docs/avalara-avatax-api-reference</a></p>
6259
<p>Find out what other developers are talking about on the <strong><em>Avalara Developer Community Forum</em></strong> located here: <a href="https://community.avalara.com/avalara/category_sets/developers" target="_blank">https://community.avalara.com/avalara/category_sets/developers</a></p>
6360
<p><strong>Frequently Asked Questions</strong> regarding all Avalara products is located here: <a href="https://help.avalara.com/" target="_blank">https://help.avalara.com/</a></p>
61+

0 commit comments

Comments
 (0)