search

casbin / casbin-hub

The hub for Casbin
https://dashboard.casbin.com
Apache License 2.0
87 stars 46 forks source link

refactor: fixed merged conflicts #109

Closed arteevraina closed 3 years ago

arteevraina commented 3 years ago

Fixes : #108 #107

Description :

Resolved merge conflicts in App.js file.

Please ensure Checkmark the following :

nodece commented 3 years ago

I guess conflict has been resolved by #111. If there are still conflicts, please create a new PR.

arteevraina commented 3 years ago

I guess conflict has been resolved by #111. If there are still conflicts, please create a new PR.

Yes, conflicts have been resolved.