Extension/deactivate account #296
Conversation
|
"one conflict" = 11 conflicts apparently |
|
I'm marking this as draft-- feel free to pop it out of draft status once the conflicts are resolved! |
itinerare
added
enhancement
# Conflicts: # app/Console/Commands/AddSiteSettings.php # app/Http/Controllers/BrowseController.php # app/Http/Controllers/Users/AccountController.php # app/Http/Controllers/Users/UserController.php # app/Models/Notification.php # app/Models/User/User.php # app/Models/User/UserSettings.php # app/Services/UserService.php # config/lorekeeper/extension_tracker.php # resources/views/browse/users.blade.php # resources/views/user/profile.blade.php
|
Fixed conflicts! Will note though that the workflow file will need to be re-added since I can't push to github with it, despite having the workflows permissions |
|
Not sure what to do about the format_php workflow since I am currently unable to push that file to my github. Gonna try to redo all my auth stuff to get it to work and allow it |
|
I'm not sure what's to be done about it since it seems to be a sourcetree issue.... it's annoying, though. Since it perceives it as a conflict I can probably override it for this PR however |
|
What's odd is it's not just sourcetree, if I try to push via VSC itself it gives the same issue, so evidently it's my account. |
|
Weird. I've just handled it for the moment, so you can handle it being uncooperative on your own time |
itinerare
added
reviewed
Ability to deactivate account
I think there was one little conflict that I can fix up