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

Delete fa_ir.js to fix bower error #689

Merged
merged 1 commit into from
Sep 28, 2016

Conversation

calvinlough
Copy link
Contributor

Fix for the following error:

Merge error: conflicting capitalizations:
pickadate/lib/translations/fa_IR.js in /tmp/funnel-dest_33herW.tmp
pickadate/lib/translations/fa_ir.js in /tmp/funnel-dest_33herW.tmp
Remove one of the files and re-add it with matching capitalization.
We are strict about this to avoid divergent behavior between case-insensitive Mac/Windows and case-sensitive Linux.

@mfpiccolo
Copy link

We are running into this also with ember-cli deploying to heroku. We are going back to 3.5.5 for the moment until this is resolved.

@campbecf
Copy link

This should fix #685

We are running into this issue on Codeship.

@olivierlesnicki
Copy link

Any updates? Also running into this...

@amsul amsul added the todo label Jul 12, 2015
@amsul amsul added this to the v3.6.0 milestone Jul 12, 2015
@amsul
Copy link
Owner

amsul commented Jul 12, 2015

Oh wow, that’s not nice. Thanks for the fix @calvinlough!

@calvinlough
Copy link
Contributor Author

@amsul No probs! You work at PumpUp don't you? As you can see from my out-of-date profile picture, I used to work there

@amsul
Copy link
Owner

amsul commented Jul 13, 2015

@calvinlough I noticed from your name! Heard quite a bit about you :). Hope you’re killing it over at FreshBooks 👍

@sly7-7
Copy link

sly7-7 commented Oct 12, 2015

Is this fix going to be merged ?

@olivierlesnicki
Copy link

cc @amsul

@renaudleo
Copy link

:)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants