diff --git a/README.md b/README.md index 2e9fbba7bf..3d756c0c05 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fb8b83f0 (Update README.md) ======= @@ -28,17 +29,27 @@ >>>>>>> c22ad402 (docs: Update README.md) ======= ======= +>>>>>>> 30130f52 (docs: Update README.md) +======= >>>>>>> cb1e9982 (docs: Update README.md) ======= ======= +>>>>>>> 591e6cd1 (docs: Update README.md) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev)

Database system for AI-powered apps

======= +<<<<<<< HEAD

Bring AI inside your database system and build AI-powered apps

>>>>>>> cd39ae6e (docs: Update README.md) ======= +======= +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 30130f52 (docs: Update README.md)

Bring AI inside your database system and build AI-powered apps

=======

Database system for AI-powered apps

@@ -50,7 +61,14 @@ =======

Database system for AI-powered apps

>>>>>>> 2022f2c9 (Update README.md) +<<<<<<< HEAD >>>>>>> fb8b83f0 (Update README.md) +======= +======= +

Bring AI inside your database system and build AI-powered apps

+>>>>>>> cd39ae6e (docs: Update README.md) +>>>>>>> 591e6cd1 (docs: Update README.md) +>>>>>>> 30130f52 (docs: Update README.md)

@@ -343,6 +361,7 @@ More details on the optimizations in EvaDB is [available here](https://evadb.rea >>>>>>> c22ad402 (docs: Update README.md) ======= +<<<<<<< HEAD ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032))

@@ -355,6 +374,7 @@ More details on the optimizations in EvaDB is [available here](https://evadb.rea <<<<<<< HEAD ======= +<<<<<<< HEAD ======= ======= @@ -372,6 +392,17 @@ More details on the optimizations in EvaDB is [available here](https://evadb.rea ======= <<<<<<< HEAD >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +======= +

+ + EvaDB + +

+ +# + +>>>>>>> cd39ae6e (docs: Update README.md) +>>>>>>> 591e6cd1 (docs: Update README.md)
Check out EvaDB on Colab @@ -393,9 +424,12 @@ More details on the optimizations in EvaDB is [available here](https://evadb.rea >>>>>>> ad6dc032 (docs: Update README.md) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) ======= +>>>>>>> 591e6cd1 (docs: Update README.md) +=======

EvaDB forks @@ -457,18 +491,28 @@ More details on the optimizations in EvaDB is [available here](https://evadb.rea >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> eva-master ======= >>>>>>> cb1e9982 (docs: Update README.md) >>>>>>> c22ad402 (docs: Update README.md) ======= +======= +>>>>>>> 30130f52 (docs: Update README.md) >>>>>>> eva-master ======= >>>>>>> cb1e9982 (docs: Update README.md) ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> cd39ae6e (docs: Update README.md) +>>>>>>> 591e6cd1 (docs: Update README.md) +>>>>>>> 30130f52 (docs: Update README.md) Downloads -->