Skip to content

delete files specific to code editors#120

Merged
willpower232 merged 3 commits into
RobThree:masterfrom
NicolasCARPi:nico-delfiles
Apr 16, 2024
Merged

delete files specific to code editors#120
willpower232 merged 3 commits into
RobThree:masterfrom
NicolasCARPi:nico-delfiles

Conversation

@NicolasCARPi

Copy link
Copy Markdown
Collaborator
  • remove TwoFactorAuth.phpproj
  • remove TwoFactorAuth.sln

They are not used anymore. See #119 (comment)

* remove TwoFactorAuth.phpproj
* remove TwoFactorAuth.sln

They are not used anymore. See #119 (comment)
@NicolasCARPi

Copy link
Copy Markdown
Collaborator Author

This will probably generate a conflict with #119 changes, so I'll fix it once #119 is merged.

@willpower232 willpower232 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should probably remove from the list in composer.json

@NicolasCARPi

Copy link
Copy Markdown
Collaborator Author

@willpower232 done, and I've also merged the new commit from master, which actually deletes the part in composer.json, so I removed them from .gitattributes.

@willpower232 willpower232 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lovely job, should I merge this now to free up the next bit?

@NicolasCARPi

Copy link
Copy Markdown
Collaborator Author

Yeah, go crazy with the merge button! I'll probably have a few conflicts to fix afterwards.

@willpower232
willpower232 merged commit 323053b into RobThree:master Apr 16, 2024
@NicolasCARPi
NicolasCARPi deleted the nico-delfiles branch April 16, 2024 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants