fix analytics and add git merge cmd
This commit is contained in:
parent
2f04f52943
commit
eb19a49b15
2 changed files with 3 additions and 3 deletions
4
.github/workflows/auto_pull_request.yaml
vendored
4
.github/workflows/auto_pull_request.yaml
vendored
|
|
@ -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: |
|
||||
|
|
|
|||
|
|
@ -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';
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue