Skip to content

Commit

Permalink
Merge remote
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
#	src/Placid.php
  • Loading branch information
alecritson committed Jul 25, 2021
2 parents 66ec2ad + de5b3bd commit 5338370
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ method: GET
path: posts/:id
auth: placeholder // See Authentication section
segments:
id: 1
id: 1
headers:
accept: application/json
accept: application/json
query:
foo: bar
foo: bar
formParams:
foo: bar
foo: bar
```
#### Authentication
Expand Down
2 changes: 0 additions & 2 deletions src/Placid.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ public function index()
{
return $this->request();
}

// protected function get

/**
* The {{ placid:example }} tag.
Expand Down

0 comments on commit 5338370

Please sign in to comment.