fix analytics and add git merge cmd

This commit is contained in:
Brord van Wierst 2024-04-08 22:54:43 +02:00
parent 2f04f52943
commit eb19a49b15
No known key found for this signature in database
GPG key ID: 0922A3CA225DF791
2 changed files with 3 additions and 3 deletions

View file

@ -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: |

View file

@ -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';