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

Hexagon puzzle work #80

Merged
merged 11 commits into from
Jul 22, 2024
Merged

Conversation

yazeedMohi
Copy link
Contributor

No description provided.

@nathansttt
Copy link
Owner

Can you remove the .DS_Store files from the commit? They aren't needed, but are conflicting. (They are in my .gitignore file, but obviously haven't completely been ignored.) If you can remove the other conflicting file (Hexagon.xcscheme) we can merge that on its own, instead of handling it with the other large commit.

@yazeedMohi
Copy link
Contributor Author

Alright I removed both .DS_Store files and recovered the old xcsheme file which we can update later as you mentioned.

@nathansttt
Copy link
Owner

@yazeedMohi Can you check the build logs above? Your commit is failing the build stage.

@nathansttt
Copy link
Owner

Given our conversation I will merge this and see what is causing the compile issues.

@nathansttt nathansttt merged commit bf154c1 into nathansttt:PDB-refactor Jul 22, 2024
0 of 2 checks passed
@lior8 lior8 mentioned this pull request Jul 30, 2024
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