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.

Sign up for GitHub

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

Jump to bottom

[Bug] Diff gone wrong #513

Closed
datdamnzotz opened this issue Feb 24, 2021 · 0 comments · Fixed by #515
Closed

[Bug] Diff gone wrong #513

datdamnzotz opened this issue Feb 24, 2021 · 0 comments · Fixed by #515
Assignees
@codeGlaze
Labels
area/application Task related to orcpub application itself bug Something isn't working good first issue Good for newcomers
Milestone
2.5.0.21

Comments

@datdamnzotz
Copy link

datdamnzotz commented Feb 24, 2021 •
edited
Loading

Remove >>> master diff gone wrong
Found at

orcpub/src/cljc/orcpub/dnd/e5/magic_items.cljc

Line 1522 in 0f0e0d7

>>>>>>> master

image
@datdamnzotz datdamnzotz added bug Something isn't working area/application Task related to orcpub application itself labels Feb 24, 2021
@datdamnzotz datdamnzotz added the good first issue Good for newcomers label Feb 24, 2021
@codeGlaze codeGlaze self-assigned this Feb 26, 2021
@datdamnzotz datdamnzotz added this to the 2.5.0.21 milestone Mar 28, 2021
@datdamnzotz datdamnzotz mentioned this issue Mar 28, 2021
Merged
5 tasks
datdamnzotz added a commit that referenced this issue Mar 28, 2021
@datdamnzotz
Merge pull request #515 from codeGlaze/Fix-249-dueling-514-bracers-ar…
85278db 
…chery

Fixes #249, Fixes#514, Fixes #513; dueling FS, bracers archery
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@codeGlaze codeGlaze

Labels
area/application Task related to orcpub application itself bug Something isn't working good first issue Good for newcomers
Projects
None yet
Milestone
2.5.0.21
Development

Successfully merging a pull request may close this issue.

Fixes #249, Fixes#514, Fixes #513; dueling FS, bracers archery codeGlaze/orcpub
2 participants
@datdamnzotz @codeGlaze