Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing overwritten changes to Makefile #20

Merged
merged 3 commits into from
Oct 16, 2024
Merged

Fixing overwritten changes to Makefile #20

merged 3 commits into from
Oct 16, 2024

Conversation

sarah-savage
Copy link
Member

Pull Request

What changed?

Replaced missing Makefile changes.

Why did it change?

File got overwritten in conflict mitigation.

Did you fix any specific issues?

Makefile wasn't working for DB seeding.

CERTIFICATION

By opening this pull request, I do agree to abide by
the CODE OF CONDUCT and be bound by the terms
of the Contribution Guidelines in effect on the date and time
of my contribution as proven by the
revision information in GitHub. I also agree that any previous contributions shall be deemed subject to the terms of the
version in effect on the date and time of this pull request, or any future revisions for pull requests I may submit.
Further, I certify that this work is my own, is original, does not violate the intellectual property of any other person
or entity, and I am not violating any license agreements or contracts I have with any person or entity. Finally, I agree
that this code may be licensed under any license deemed appropraite by AspirePress, including but not
limited to open source, closed source, proprietary or custom licenses, and that such license terms neither violate my
rights or my copyright to this code.

@sarah-savage sarah-savage added the bug Something isn't working label Oct 16, 2024
@sarah-savage sarah-savage self-assigned this Oct 16, 2024
@chuckadams chuckadams merged commit aab6828 into main Oct 16, 2024
1 check passed
sarah-savage added a commit that referenced this pull request Oct 17, 2024
* Fixing overwritten changes to Makefile

* fix(Makefile): use frankenphp target for build-prod

* ci: build dev target on webapp-frankenphp

---------

Co-authored-by: Chuck Adams <cja987@gmail.com>
@chuckadams chuckadams deleted the fixing-makefile branch October 17, 2024 15:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants