From e77416a261e004bf7acc78a26b6f302000340664 Mon Sep 17 00:00:00 2001
From: Predrag Knezevic <predrag.knezevic@upbound.io>
Date: Thu, 23 Nov 2023 17:22:59 +0100
Subject: [PATCH] wip

---
 .github/workflows/diff.yaml | 4 ----
 examples/xr-cluster.yaml    | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/diff.yaml b/.github/workflows/diff.yaml
index bbf34c2..021585e 100644
--- a/.github/workflows/diff.yaml
+++ b/.github/workflows/diff.yaml
@@ -13,8 +13,4 @@ jobs:
         uses: pedjak/crossplane-diff-action@action
         with:
           dir: examples
-<<<<<<< HEAD
           github-token: ${{ secrets.GITHUB_TOKEN }}
-=======
-          token: ${{ secrets.GITHUB_TOKEN }}
->>>>>>> 4432273 (wip)
diff --git a/examples/xr-cluster.yaml b/examples/xr-cluster.yaml
index b5b146d..a33de4b 100644
--- a/examples/xr-cluster.yaml
+++ b/examples/xr-cluster.yaml
@@ -3,12 +3,13 @@ kind: XCluster
 metadata:
   name: aws-spoke-01
   annotations:
+    foo: "3"
     crossplane.io/render-composition-path: apis/cluster/composition.yaml
     crossplane.io/render-function-path: examples/functions.yaml
 spec:
   parameters:
     id: aws-spoke-02
-    region: us-west-2
+    region: us-west-1
     version: "1.26"
     nodes:
       count: 5