Removes a left over merge conflict marker. (#434)

Author: tmacam

examples/demo_actor/README.md

@@ -137,11 +137,7 @@ expected_stdout_lines:
 
 > For example, [docker registry] is docker hub account.
 
-<<<<<<< HEAD
-2. Follow [these steps](https://docs.dapr.io/reference/components-reference/supported-configuration-stores/redis-configuration-store/#setup-redis) to create a Redis store.
-=======
 2. Follow [these steps](https://docs.dapr.io/getting-started/tutorials/configure-state-pubsub/#step-1-create-a-redis-store) to create a Redis store.
->>>>>>> c8f4e5d (Fixed external link validation)
 
 3. Once your store is created,  confirm validate `redis.yml` file in the `deploy` directory. 
     > **Note:** the `redis.yml` uses the secret created by `bitmany/redis` Helm chat to securely inject the password.