This is an automated email from the ASF dual-hosted git repository.

aloalt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-wayang-website.git

commit 3a2645a8e70afd2ca757fc82409274e72ff84e93
Merge: 1da380d8 c752922f
Author: 2pk03 <[email protected]>
AuthorDate: Tue Jan 30 10:17:21 2024 +0100

    resolved sync conflict

 src/components/HomepageFeatures/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc src/components/HomepageFeatures/index.tsx
index 94a1bbf6,093b8adf..45799df1
--- a/src/components/HomepageFeatures/index.tsx
+++ b/src/components/HomepageFeatures/index.tsx
@@@ -64,4 -64,4 +64,4 @@@ export default function HomepageFeature
        </div>
      </section>
    );
--}
++}

Reply via email to