diff options
| author | Richard Beales <[email protected]> | 2013-03-20 16:59:19 +0000 |
|---|---|---|
| committer | Richard Beales <[email protected]> | 2013-03-20 16:59:19 +0000 |
| commit | 77accf45df3072bf0e3fe1e919bb75fc14313119 (patch) | |
| tree | 84be283769a6849f4916880739044a163e6f4761 /locale/nb_NO/LC_MESSAGES/messages.mo | |
| parent | 04ed8b423abd9046ac4ee6813cf5e98b37aad2a3 (diff) | |
| parent | 2d2d08fc41dec694ac0895368eff3eb80a173a5b (diff) | |
fix merge conflict with stylesheet tags
Diffstat (limited to 'locale/nb_NO/LC_MESSAGES/messages.mo')
| -rw-r--r-- | locale/nb_NO/LC_MESSAGES/messages.mo | bin | 24815 -> 24815 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo Binary files differindex 1c2e07ab1..12669403c 100644 --- a/locale/nb_NO/LC_MESSAGES/messages.mo +++ b/locale/nb_NO/LC_MESSAGES/messages.mo |