diff options
| author | Lain Soykaf <lain@lain.com> | 2025-02-25 16:23:46 +0400 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2025-02-25 16:23:46 +0400 |
| commit | 5851d787b6001c117808d5993ca491d0e58dfaf4 (patch) | |
| tree | 0bb5d1c39e53e567b5cbdd1f4ac3085d3ac3abcc /test/mix | |
| parent | bee027e51163d980991f4442a3eb3b0429f0fc40 (diff) | |
| parent | 6f48ade41736ffd5ac02eee445c35516cbbbe907 (diff) | |
| download | pleroma-5851d787b6001c117808d5993ca491d0e58dfaf4.tar.gz pleroma-5851d787b6001c117808d5993ca491d0e58dfaf4.zip | |
Merge branch and resolve conflict in database_test.exs
Diffstat (limited to 'test/mix')
| -rw-r--r-- | test/mix/tasks/pleroma/database_test.exs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/mix/tasks/pleroma/database_test.exs b/test/mix/tasks/pleroma/database_test.exs index 65c4db27c..38ed096ae 100644 --- a/test/mix/tasks/pleroma/database_test.exs +++ b/test/mix/tasks/pleroma/database_test.exs @@ -412,6 +412,7 @@ defmodule Mix.Tasks.Pleroma.DatabaseTest do ["schema_migrations"], ["thread_mutes"], ["user_follows_hashtag"], + # ["user_frontend_setting_profiles"], # not in pleroma ["user_invite_tokens"], ["user_notes"], ["user_relationships"], |