Add Austria #153
Add Austria #153
Conversation
| "Austria" | ||
|
|
||
| FIXED_HOLIDAYS = WesternCalendar.FIXED_HOLIDAYS + ( | ||
| (5, 1, "National Holiday"), # Staatsfeiertag |
There was a problem hiding this comment.
Dunno, could be, I'm not any kind of expert on these things :)
I generally go with with Wikipedia on these things.
Austria.info looks kinda official and the literal translation of Staatsfeiertag is National Day.
There was a problem hiding this comment.
right, we'll keep it that way until someone finds a better wording ; what's important is the date, the label can wait.
|
there's a tiny conflict in the CHANGELOG, because I've merged the #155 PR |
|
so you still have to solve the conflicts with CHANGELOG |
|
great one! althought it would have been better to have solved the conflict using "rebase" rather than "merge" to keep your branch clean ; if you need some help to do so for your future contributions, I'd be glad to. |
|
Yeah, sorry about that, I'm still figuring out the git workflows.
…Sent from my iPhone
On 05 Dec 2016, at 20:55, Bruno Bord ***@***.***> wrote:
great one! althought it would have been better to have solved the conflict using "rebase" rather than "merge" to keep your branch clean ; if you need some help to do so for your future contributions, I'd be glad to.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub, or mute the thread.
|
Add Austria