search

zendframework / zend-navigation

Navigation component from Zend Framework
BSD 3-Clause "New" or "Revised" License
20 stars 25 forks source link

Fix merge conflict marks in docs #75

Closed Xerkus closed 6 years ago

Xerkus commented 6 years ago

Fixes #74

Resolves merge conflict and removes marks accidentally committed in https://github.com/zendframework/zend-navigation/commit/65b9c7b49266b6eb68101c71805b2c0839b691b6