diff options
| author | Hector Palacios <hector.palacios@digi.com> | 2011-01-20 13:54:22 +0100 |
|---|---|---|
| committer | Hector Palacios <hector.palacios@digi.com> | 2011-01-26 12:21:17 +0100 |
| commit | d172486aaf22e6860939fa7c44a812b2f0c675a9 (patch) | |
| tree | e866f5a695d14ec1a3bb62d222e7346b0ed1827d /scripts | |
| parent | 4080809079651216230566377c563a463ab10f30 (diff) | |
solve merge conflicts
The previous merge commit was a mixed auto-manual merge operation
not followed by a compilation.
The present commit fixes compilation problems introduced by the
merge operation.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/setlocalversion | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 458dacb54be9..47cd243ae681 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -40,6 +40,7 @@ scm_version() fi if test "$1" = "--short"; then short=true + fi # Do we have a DEL-tag? if git name-rev --tags HEAD | grep -i "del-" > /dev/null; then |