On Fri, Aug 28, 2015 at 01:47:32PM +, Eren Yagdiran wrote:
> Conflicts:
> virt-sandbox-image/virt-sandbox-image.py
> ---
> virt-sandbox-image/virt-sandbox-image.py | 8
> 1 file changed, 8 insertions(+)
>
> diff --git a/virt-sandbox-image/virt-sandbox-image.py
>
Conflicts:
virt-sandbox-image/virt-sandbox-image.py
---
virt-sandbox-image/virt-sandbox-image.py | 8
1 file changed, 8 insertions(+)
diff --git a/virt-sandbox-image/virt-sandbox-image.py
b/virt-sandbox-image/virt-sandbox-image.py
index fa9e1c8..55aea6a 100755
---