Skip to content

Commit

Permalink
fix: merge conflicts.
Browse files Browse the repository at this point in the history
Signed-off-by: DivyPatel9881 <[email protected]>
  • Loading branch information
divy9881 committed Jul 15, 2020
1 parent 6caf08e commit 2bfebf8
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ Casbin-CPP

**News**: Are you still worried about how to write the correct Casbin policy? ``Casbin online editor`` is coming to help! Try it at: http://casbin.org/editor/

## Build Availability on Platforms:
Operating Systems | Availability status
----------------- | -------------------
Windows (VS C++) | :heavy_check_mark: Available
Linux and MacOS | :wrench: Under-Development


![casbin Logo](casbin-logo.png)

## All the languages supported by Casbin:
Expand Down Expand Up @@ -130,7 +137,6 @@ Note: you can also initialize an enforcer with policy in DB instead of file, see
vector<string> roles( e->GetImplicitRolesForUser(sub) );
```


## Policy management

Casbin provides two sets of APIs to manage permissions:
Expand Down

0 comments on commit 2bfebf8

Please sign in to comment.