From eb19a49b1504f8b6a0e2ade29eacccae31475715 Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Mon, 8 Apr 2024 22:54:43 +0200 Subject: [PATCH] fix analytics and add git merge cmd --- .github/workflows/auto_pull_request.yaml | 4 ++-- lib/pangea/pages/analytics/construct_cloud.dart | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/auto_pull_request.yaml b/.github/workflows/auto_pull_request.yaml index d35521e24..9ba416156 100644 --- a/.github/workflows/auto_pull_request.yaml +++ b/.github/workflows/auto_pull_request.yaml @@ -20,8 +20,8 @@ jobs: - name: Pull changes from FluffyChat run: | git remote add fluffychat https://github.com/krille-chan/fluffychat - git fetch fluffychat - git merge --no-edit fluffychat/main + git fetch fluffychat main + git merge --no-edit fluffychat/main --allow-unrelated-histories - name: Push changes run: | diff --git a/lib/pangea/pages/analytics/construct_cloud.dart b/lib/pangea/pages/analytics/construct_cloud.dart index 67bdb02c9..a4aeb9cc1 100644 --- a/lib/pangea/pages/analytics/construct_cloud.dart +++ b/lib/pangea/pages/analytics/construct_cloud.dart @@ -1,6 +1,6 @@ +import 'package:fluffychat/pangea/pages/analytics/base_analytics.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/pangea/pages/analytics/base_analytics_page.dart'; import '../../word_cloud/word_cloud_data.dart'; import '../../word_cloud/word_cloud_shape.dart'; import '../../word_cloud/word_cloud_tap.dart';