test: Mergefail fixupv2.1.1.1v2.1.1.1-beta1
commit22bb290331b827d9d10521e3895ed3f7c7ab215c
authorRobin Sonefors <robin.sonefors@op5.com>
Tue, 27 May 2014 15:04:13 +0000 (27 17:04 +0200)
committerRobin Sonefors <robin.sonefors@op5.com>
Tue, 27 May 2014 15:04:13 +0000 (27 17:04 +0200)
treecaeb6f5a106f81376560c2ce3b2d5c704b29df73
parent008b3039fc23e859a810ef4b2d8a7ebb602628c6
test: Mergefail fixup

Change-Id: I7a36dcba41e008c1080b6782a09069d83d933e79
Signed-off-by: Robin Sonefors <robin.sonefors@op5.com>
apps/libexec/test.py