bij1
/
terraform-provider-greenhost
19
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removing merge cruft

This commit is contained in:
Aaron J. Smith 2019-01-04 08:03:46 -06:00
parent 9915503d9a
commit 58719590e7
No known key found for this signature in database
GPG Key ID: DA7EEB938E9FF8FB
1 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
website/digitalocean.erb
View File

@ -50,52 +50,11 @@
</li>
<li<%= sidebar_current("docs-do-resource") %>>
<<<<<<< HEAD
<a href="#">Resources</a>
<ul class="nav nav-visible">
<li<%= sidebar_current("docs-do-resource-bucket") %>>
<a href="/docs/providers/do/r/bucket.html">digitalocean_bucket</a>
</li>
<li<%= sidebar_current("docs-do-resource-certificate") %>>
<a href="/docs/providers/do/r/certificate.html">digitalocean_certificate</a>
</li>
<li<%= sidebar_current("docs-do-resource-domain") %>>
<a href="/docs/providers/do/r/domain.html">digitalocean_domain</a>
</li>
<li<%= sidebar_current("docs-do-resource-droplet") %>>
<a href="/docs/providers/do/r/droplet.html">digitalocean_droplet</a>
</li>
<li<%= sidebar_current("docs-do-resource-firewall") %>>
<a href="/docs/providers/do/r/firewall.html">digitalocean_firewall</a>
</li>
<li<%= sidebar_current("docs-do-resource-floating-ip") %>>
<a href="/docs/providers/do/r/floating_ip.html">digitalocean_floating_ip</a>
</li>
<li<%= sidebar_current("docs-do-resource-loadbalancer") %>>
<a href="/docs/providers/do/r/loadbalancer.html">digitalocean_loadbalancer</a>
</li>
<li<%= sidebar_current("docs-do-resource-record") %>>
<a href="/docs/providers/do/r/record.html">digitalocean_record</a>
</li>
<li<%= sidebar_current("docs-do-resource-ssh-key") %>>
<a href="/docs/providers/do/r/ssh_key.html">digitalocean_ssh_key</a>
</li>
<li<%= sidebar_current("docs-do-resource-tag") %>>
<a href="/docs/providers/do/r/tag.html">digitalocean_tag</a>
</li>
<li<%= sidebar_current("docs-do-resource-volume") %>>
<a href="/docs/providers/do/r/volume.html">digitalocean_volume</a>
</li>
</ul>
=======
<a href="#">Resources</a>
<ul class="nav nav-visible">
<li<%= sidebar_current("docs-do-resource-bucket") %>>
<a href="/docs/providers/do/r/bucket.html">digitalocean_bucket</a>
</li>
<li<%= sidebar_current("docs-do-resource-certificate") %>>
<a href="/docs/providers/do/r/certificate.html">digitalocean_certificate</a>
</li>
@ -136,7 +95,6 @@
<a href="/docs/providers/do/r/volume_snapshot.html">digitalocean_volume_snapshot</a>
</li>
</ul>
>>>>>>> master
</li>
</ul>
</div>