Resolve merge conflict with master and remove demo entries from top-level README

Author: olyagpl

.github/workflows/polyglot-chat-app.yml

@@ -18,14 +18,11 @@ jobs:
     name: Run 'polyglot-chat-app'
     runs-on: ubuntu-latest
     timeout-minutes: 15
-    strategy:
-      matrix:
-        java-version: ['21']
     steps:
       - uses: actions/checkout@v3
       - uses: graalvm/setup-graalvm@v1
         with:
-          java-version: ${{ matrix.java-version }}
+          java-version: '21'
           distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
           cache: 'gradle'

README.md

@@ -238,27 +238,6 @@ cd graalvm-demos
   </tbody>
 </table>
 
-### Python
-
-<table>
-  <thead>
-    <tr>
-      <th align="left">Name</th>
-      <th align="left">Description</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td align="left" width="30%"><a href="/graalpy-notebook-example/">graalpy-notebook-example</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/graalpy-notebook-example.yml"><img alt="graalpy-notebook-example" src="https://github.com/graalvm/graalvm-demos/actions/workflows/graalpy-notebook-example.yml/badge.svg" /></a></td>
-      <td align="left" width="70%">Demonstrates how to embed Python in a Java application running on GraalVM <br><strong>Technologies: </strong>GraalPy</td>
-    </tr>
-    <tr>
-      <td align="left" width="30%"><a href="/polyglot-chat-app/">polyglot-chat-app</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/polyglot-chat-app.yml"><img alt="polyglot-chat-app" src="https://github.com/graalvm/graalvm-demos/actions/workflows/polyglot-chat-app.yml/badge.svg" /></a></td>
-      <td align="left" width="70%">Demonstrates how to integrate Python in a Micronaut Java application and build using Gradle <br><strong>Technologies: </strong>Java, GraalPy, Micronaut</td>
-    </tr>
-  </tbody>
-</table>
-
 ### Polyglot
 
 <table>

polyglot-chat-app/README.md

@@ -7,12 +7,12 @@ The example also shows how to create a native executable from the application us
 ## Preparation
 
 1. Download or clone the GraalVM demos repository and navigate into the _polyglot-chat-app_ directory:
-    ```bash
-    git clone https://github.com/graalvm/graalvm-demos
-    ```
-    ```bash
-    cd graalvm-demos/polyglot-chat-app
-    ```
+   ```bash
+   git clone https://github.com/graalvm/graalvm-demos
+   ```
+   ```bash
+   cd graalvm-demos/polyglot-chat-app
+   ```
 
 2. Download and install the latest GraalPy as described in the [Getting Started guide](https://www.graalvm.org/latest/reference-manual/python/#installing-graalpy). For example:
    ```bash
@@ -81,4 +81,4 @@ The Python code must be copied to the _build/_ directory that is kept next to th
 
 ### Learn More 
 
-Learn more about GraalVM polyglot capabilities [here](https://www.graalvm.org/latest/reference-manual/polyglot-programming/).
+Learn more about GraalVM polyglot capabilities [here](https://www.graalvm.org/latest/reference-manual/polyglot-programming/).