resolve conflict versions#159

onjiz wants to merge 1 commit intorinvex:masterrinvex/laravel-attributes:masterfrom

onjiz:resolve-conflictonjiz/laravel-attributes:resolve-conflictCopy head branch name to clipboard