Skip to content

Commit

Permalink
combining license and copyright reference
Browse files Browse the repository at this point in the history
  • Loading branch information
ksbeattie authored Dec 20, 2017
1 parent 76da678 commit c01d91c
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ The Oxy-Combustion Models package consists of two primary components: A detailed
## Development Practices

* Code development will be peformed in a forked copy of the repo. Commits will not be
made directly to the ngt-archive repo. Developers will submit a pull
request that is then merged by another team member, if another team member is available.
made directly to the repo. Developers will submit a pull request that is then merged
by another team member, if another team member is available.
* Each pull request should contain only related modifications to a feature or bug fix.
* Sensitive information (secret keys, usernames etc) and configuration data
(e.g database host port) should not be checked in to the repo.
Expand All @@ -26,10 +26,6 @@ See also the list of [contributors](https://github.com/CCSI-Toolset/Oxy-Combusti
We use [SemVer](http://semver.org/) for versioning. For the versions available,
see the [tags on this repository](https://github.com/CCSI-Toolset/Oxy-CombustionModels_bundle/tags).

## License
## License & Copyright

See [LICENSE.md](LICENSE.md) file for details

## Copyright Notice

TBD

0 comments on commit c01d91c

Please sign in to comment.