Skip to content

Commit

Permalink
Merge pull request #6 from airbnb/fd/amendments
Browse files Browse the repository at this point in the history
Add Contributors and Amendments sections
  • Loading branch information
fdiaz authored Aug 31, 2018
2 parents 79d11be + 198784e commit 4a96020
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Following this style guide should:

Note that brevity is not a primary goal. Code should be made more concise only if other good code qualities (such as readability, simplicity, and clarity) remain equal or are improved.

## Guiding Tenets
## Guiding Tenets

* This guide is in addition to the official [Swift API Design Guidelines](https://swift.org/documentation/api-design-guidelines/). These rules should not contradict that document.
* These rules should not fight Xcode's <kbd>^</kbd> + <kbd>I</kbd> indentation behavior.
Expand All @@ -27,6 +27,8 @@ Note that brevity is not a primary goal. Code should be made more concise only i
1. [Patterns](#patterns)
1. [File Organization](#file-organization)
1. [Objective-C Interoperability](#objective-c-interoperability)
1. [Contributors](#contributors)
1. [Amendments](#amendments)

## Xcode Formatting

Expand Down Expand Up @@ -1415,4 +1417,16 @@ _You can enable the following settings in Xcode by running [this script](resourc

</details>

**[ back to top](#table-of-contents)**
**[ back to top](#table-of-contents)**

## Contributors

- [View Contributors](https://github.com/airbnb/javascript/graphs/contributors)

**[ back to top](#table-of-contents)**

## Amendments

We encourage you to fork this guide and change the rules to fit your team’s style guide. Below, you may list some amendments to the style guide. This allows you to periodically update your style guide without having to deal with merge conflicts.

**[ back to top](#table-of-contents)**

0 comments on commit 4a96020

Please sign in to comment.