Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix merge conflict markings #14645

Merged
merged 1 commit into from
Sep 15, 2022
Merged

fix merge conflict markings #14645

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions website/content/docs/intro/index.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,7 @@ description: >-

# What is Consul?

<<<<<<< HEAD
Welcome to the intro guide to Consul! This guide is the best place to start
with Consul. We cover what Consul is, what problems it can solve, how it compares
to existing software, and how you can get started using it. If you are familiar
with the basics of Consul, the [documentation](/docs) provides a more
detailed reference of available features. If you're ready to get hands-on
experience, deploy Consul locally with our
[HashiCorp Learn tutorial](https://learn.hashicorp.com/tutorials/consul/get-started-install).
=======
HashiCorp Consul is a service networking solution that enables teams to manage secure network connectivity between services and across on-prem and multi-cloud environments and runtimes. Consul offers service discovery, service mesh, traffic management, and automated updates to network infrastructure device. You can use these features individually or together in a single Consul deployment.
>>>>>>> 843d9cdaae (Merge pull request #14603 from hashicorp/docs/what-is-consul-devdot-update)

> **Hands-on**: Complete the Getting Started tutorials to learn how to deploy Consul:
- [Get Started on Kubernetes](https://learn.hashicorp.com/collections/consul/gs-consul-service-mesh)
Expand Down