docs: Update README.md

alexxx-db · Nov 22, 2023 · cabf949 · cabf949
1 parent 16dc111
commit cabf949
Showing 1 changed file with 59 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -32,7 +32,10 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> 547a3d0c (docs: Update README.md)
 =======
 >>>>>>> 40a10ce1 (Bump v0.3.4+ dev)
 >>>>>>> bf18bc80 (Bump v0.3.4+ dev)
@@ -45,6 +48,7 @@
 =======
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 30130f52 (docs: Update README.md)
 =======
 >>>>>>> 22e78346 (Bump v0.3.4+ dev)
@@ -83,9 +87,15 @@
 >>>>>>> c22ad402 (docs: Update README.md)
 >>>>>>> 75cf118f (docs: Update README.md)
 =======
+=======
+>>>>>>> 30130f52 (docs: Update README.md)
+=======
+>>>>>>> 547a3d0c (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)
@@ -94,6 +104,9 @@
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 547a3d0c (docs: Update README.md)
 <p align="center"><i><b>Bring AI inside your database system and build AI-powered apps</b></i></p>
 >>>>>>> cd39ae6e (docs: Update README.md)
 =======
@@ -121,6 +134,7 @@
 >>>>>>> cd39ae6e (docs: Update README.md)
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 591e6cd1 (docs: Update README.md)
 <<<<<<< HEAD
 >>>>>>> 30130f52 (docs: Update README.md)
@@ -153,6 +167,10 @@
 >>>>>>> 2022f2c9 (Update README.md)
 >>>>>>> fb8b83f0 (Update README.md)
 >>>>>>> f714fec4 (Update README.md)
+=======
+>>>>>>> 591e6cd1 (docs: Update README.md)
+>>>>>>> 30130f52 (docs: Update README.md)
+>>>>>>> 547a3d0c (docs: Update README.md)
 
 <p align="center">
 <a href="https://github.com/georgia-tech-db/evadb/fork" target="blank">
@@ -209,9 +227,12 @@
 >>>>>>> c22ad402 (docs: Update README.md)
 =======
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
+>>>>>>> 30130f52 (docs: Update README.md)
+=======
 >>>>>>> 8c5b63dc (release: merge staging into master (#1032))
 =======
 >>>>>>> a9124e1e (release: merge staging into master (#1032))
@@ -226,6 +247,7 @@
 
 <<<<<<< HEAD
 =======
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -264,7 +286,21 @@
 =======
 <<<<<<< HEAD
 >>>>>>> 7dd70375 (release: merge staging into master (#1032))
+<<<<<<< HEAD
 >>>>>>> f028c383 (release: merge staging into master (#1032))
+=======
+=======
+<p align="center">
+  <a href="https://evadb.readthedocs.io">
+    <img src="https://raw.githubusercontent.com/georgia-tech-db/evadb/master/docs/images/evadb/evadb-full-logo.svg" width="500" alt="EvaDB">
+  </a>
+</p>
+
+#
+
+>>>>>>> cd39ae6e (docs: Update README.md)
+>>>>>>> 591e6cd1 (docs: Update README.md)
+>>>>>>> 30130f52 (docs: Update README.md)
 <div align="center">
         <a href="https://colab.research.google.com/github/georgia-tech-db/evadb/blob/master/tutorials/03-emotion-analysis.ipynb">
             <img src="https://colab.research.google.com/assets/colab-badge.svg" alt="Check out EvaDB on Colab"/>
@@ -287,6 +323,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
           <img alt="Downloads" src="https://static.pepy.tech/badge/evadb"/>
         </a> -->  
@@ -613,6 +650,9 @@ More details on the optimizations in EvaDB is [available here](https://evadb.rea
 <<<<<<< HEAD
 >>>>>>> 54907d3e (release: merge staging into master (#1032))
 =======
+<<<<<<< HEAD
+>>>>>>> 547a3d0c (docs: Update README.md)
+=======
 >>>>>>> c63abee7 (release: merge staging into master (#1032))
 >>>>>>> 065f25fb (release: merge staging into master (#1032))
 =======
@@ -629,9 +669,13 @@ More details on the optimizations in EvaDB is [available here](https://evadb.rea
 >>>>>>> c22ad402 (docs: Update README.md)
 =======
 =======
+>>>>>>> 30130f52 (docs: Update README.md)
+=======
 >>>>>>> 7dd70375 (release: merge staging into master (#1032))
 >>>>>>> f028c383 (release: merge staging into master (#1032))
 =======
+>>>>>>> 591e6cd1 (docs: Update README.md)
+=======
 <p align="center">
 <a href="https://github.com/georgia-tech-db/evadb/fork" target="blank">
 <img src="https://img.shields.io/github/forks/georgia-tech-db/evadb?style=for-the-badge" alt="EvaDB forks"/>
@@ -700,7 +744,10 @@ More details on the optimizations in EvaDB is [available here](https://evadb.rea
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> 547a3d0c (docs: Update README.md)
 =======
 >>>>>>> cd39ae6e (docs: Update README.md)
 =======
@@ -713,26 +760,35 @@ More details on the optimizations in EvaDB is [available here](https://evadb.rea
 >>>>>>> c22ad402 (docs: Update README.md)
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 30130f52 (docs: Update README.md)
 =======
 >>>>>>> 28d8bad1 (release: merge staging into master (#1032))
 =======
 >>>>>>> 54907d3e (release: merge staging into master (#1032))
+=======
+=======
+>>>>>>> 30130f52 (docs: Update README.md)
+>>>>>>> 547a3d0c (docs: Update README.md)
 >>>>>>> eva-master
 =======
 >>>>>>> cb1e9982 (docs: Update README.md)
 =======
 >>>>>>> 7dd70375 (release: merge staging into master (#1032))
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 547a3d0c (docs: Update README.md)
 >>>>>>> f028c383 (release: merge staging into master (#1032))
 =======
 =======
 =======
 >>>>>>> cd39ae6e (docs: Update README.md)
 >>>>>>> 591e6cd1 (docs: Update README.md)
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 30130f52 (docs: Update README.md)
 =======
 =======
@@ -769,6 +825,9 @@ More details on the optimizations in EvaDB is [available here](https://evadb.rea
 =======
 >>>>>>> f028c383 (release: merge staging into master (#1032))
 >>>>>>> 54907d3e (release: merge staging into master (#1032))
+=======
+>>>>>>> 30130f52 (docs: Update README.md)
+>>>>>>> 547a3d0c (docs: Update README.md)
           <img alt="Downloads" src="https://static.pepy.tech/badge/evadb"/>
         </a> -->  
   <br />