Skip to content

Commit 0d75fa6

Browse files
committed
Updated README
1 parent f6b27bd commit 0d75fa6

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

README.md

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,30 +26,10 @@ This is the official PHP client for [Elasticsearch](https://www.elastic.co/elast
2626

2727
## Getting started 🐣
2828

29-
<<<<<<< HEAD
30-
| Elasticsearch-PHP Branch | PHP Version |
31-
| ----------- | ------------------------ |
32-
| >= 7.16.0, < 8.0.0 | >= 7.3.0, <= 8.1.99 |
33-
| >= 7.12.0, < 8.0.0 | >= 7.3.0, <= 8.0.99 |
34-
| >= 7.11.0, < 8.0.0 | >= 7.1.0, <= 8.0.99 |
35-
| >= 7.0.0, < 7.11.0 | >= 7.1.0, < 8.0.0 |
36-
| 6.x | >= 7.0.0, < 8.0.0 |
37-
| 5.x | >= 5.6.6, < 8.0.0 |
38-
| 2.x | >= 5.4.0, < 7.0.0 |
39-
| 0.4, 1.x | >= 5.3.9, < 7.0.0 |
40-
41-
- If you are using Elasticsearch 7.x, you can use Elasticsearch-PHP 7.x branch.
42-
- If you are using Elasticsearch 6.x, you can use Elasticsearch-PHP 6.x branch.
43-
- If you are using Elasticsearch 5.x, you can use Elasticsearch-PHP 6.x branch.
44-
- If you are using Elasticsearch 1.x or 2.x, prefer using the Elasticsearch-PHP 2.0 branch. The 1.0 branch is compatible however.
45-
- If you are using a version older than 1.0, you must install the `0.4` Elasticsearch-PHP branch. Since ES 0.90.x and below is now EOL, the corresponding `0.4` branch will not receive any more development or bugfixes. Please upgrade.
46-
- You should never use Elasticsearch-PHP Master branch, as it tracks Elasticsearch master and may contain incomplete features or breaks in backwards compatibility. Only use ES-PHP master if you are developing against ES master for some reason.
47-
=======
4829
Using this client assumes that you have an [Elasticsearch](https://www.elastic.co/elasticsearch/)
4930
server installed and running.
5031

5132
You can install the client in your PHP project using [composer](https://getcomposer.org/):
52-
>>>>>>> 8.0
5333

5434
```bash
5535
composer require elasticsearch/elasticsearch

0 commit comments

Comments
 (0)