On 6/10/19 12:24 AM, Zang Ruochen wrote:
> -Remove redundant sed operations.
>
> -Rename conflicting files to resolve conflicts.
merged to master.
working on warrior
thanks,
- armin
>
>
> Zang Ruochen (3):
> [yocto][meta-security][master][warrior][PATCH 1/3] python-scapy: Remove
>
-Remove redundant sed operations.
-Rename conflicting files to resolve conflicts.
Zang Ruochen (3):
[yocto][meta-security][master][warrior][PATCH 1/3] python-scapy: Remove
redundant sed operations
[yocto][meta-security][master][warrior][PATCH 2/3] python-scapy: solved
the conflict
