docs: Update README.md

alexxx-db · Oct 30, 2023 · 547a3d0 · 547a3d0
1 parent bf18bc8
commit 547a3d0
Showing 1 changed file with 51 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -21,6 +21,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 40a10ce1 (Bump v0.3.4+ dev)
 =======
@@ -31,17 +32,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)
 <p align="center"><i><b>Database system for AI-powered apps</b></i></p>
 =======
+<<<<<<< HEAD
 <p align="center"><i><b>Bring AI inside your database system and build AI-powered apps</b></i></p>
 >>>>>>> cd39ae6e (docs: Update README.md)
 =======
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> 30130f52 (docs: Update README.md)
 <p align="center"><i><b>Bring AI inside your database system and build AI-powered apps</b></i></p>
 =======
 <p align="center"><i><b>Database system for AI-powered apps</b></i></p>
@@ -53,7 +64,14 @@
 =======
 <p align="center"><i><b>Database system for AI-powered apps</b></i></p>
 >>>>>>> 2022f2c9 (Update README.md)
+<<<<<<< HEAD
 >>>>>>> fb8b83f0 (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)
+>>>>>>> 591e6cd1 (docs: Update README.md)
+>>>>>>> 30130f52 (docs: Update README.md)
 
 <p align="center">
 <a href="https://github.com/georgia-tech-db/evadb/fork" target="blank">
@@ -121,9 +139,12 @@
 >>>>>>> c22ad402 (docs: Update README.md)
 =======
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
+>>>>>>> 30130f52 (docs: Update README.md)
+=======
 >>>>>>> 8c5b63dc (release: merge staging into master (#1032))
 <p align="center">
   <a href="https://evadb.readthedocs.io">
@@ -135,6 +156,7 @@
 
 <<<<<<< HEAD
 =======
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -173,7 +195,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"/>
@@ -197,15 +233,20 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> c63abee7 (release: merge staging into master (#1032))
 =======
 >>>>>>> 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"/>
@@ -268,6 +309,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> cd39ae6e (docs: Update README.md)
 =======
@@ -278,12 +320,21 @@
 >>>>>>> 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)
           <img alt="Downloads" src="https://static.pepy.tech/badge/evadb"/>
         </a> -->  
   <br />