Resolve merge conflict in urls.py
This commit is contained in:
@@ -10,10 +10,12 @@ from core.apps.api.views import (
|
||||
SearchAdsViewSet,
|
||||
SearchHistoryViewSet,
|
||||
UserLikeViewSet,
|
||||
AdsView,
|
||||
)
|
||||
|
||||
router = DefaultRouter()
|
||||
router.register("search-ads", SearchAdsViewSet, basename="search-ads")
|
||||
router.register("ads", AdsView, basename="ads")
|
||||
router.register("banner", BannerViewSet, basename="banner")
|
||||
router.register("notification", NotificationViewSet, basename="notification")
|
||||
router.register("user-like", UserLikeViewSet, basename="user-like")
|
||||
|
||||
Reference in New Issue
Block a user