#!/bin/bash # Do not warn if there were no real merge git rev-parse -q --verify HEAD^2 >/dev/null || exit echo echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" echo "! You probably used 'git pull' instead of 'git pull -r' !" echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" echo echo "You can still fix it - please do 'git pull -r' now." echo Git repository'/>
aboutsummaryrefslogtreecommitdiff
path: root/source/es/reportdesign
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2014-11-10 12:03:54 +0100
committerAndras Timar <andras.timar@collabora.com>2014-11-23 14:21:26 +0100
commit5da7698be5086a0317777dceb18dbccb89a2fa69 (patch)
tree0f63b6c9055ba5fd795e9cbc2493f99ff9ca0859 /source/es/reportdesign
parentf0108b522877624aaad39920a2f1a7a7e321c5a5 (diff)
update translatios for 4.3.4 rc1