-
Notifications
You must be signed in to change notification settings - Fork 332
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "reset links for mmguero-dev/Malcolm"
This reverts commit 5dba91b.
- Loading branch information
Showing
5 changed files
with
1 addition
and
1,466 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3846,13 +3846,6 @@ The Malcolm project uses [semantic versioning](https://semver.org/) when choosin | |
|
||
If you are interested in contributing to the Malcolm project, please read the [Malcolm Contributor Guide](./docs/contributing/README.md). | ||
|
||
<<<<<<< HEAD | ||
## <a name="Forks"></a>Forks | ||
|
||
[CISA](https://www.cisa.gov/) maintains the upstream source code repository for Malcolm at [https://github.com/cisagov/Malcolm](https://github.com/cisagov/Malcolm). The [Idaho National Lab](https://inl.gov/)'s fork of Malcolm, which is currently kept up-to-date with CISA's upstream development, can be found at [https://github.com/idaholab/Malcolm](https://github.com/idaholab/Malcolm). | ||
|
||
======= | ||
>>>>>>> parent of 7053d00 (reset links for idaholab/Malcolm) | ||
## <a name="Footer"></a>Copyright | ||
|
||
[Malcolm](https://github.com/cisagov/Malcolm) is Copyright 2022 Battelle Energy Alliance, LLC, and is developed and released through the cooperation of the [Cybersecurity and Infrastructure Security Agency](https://www.cisa.gov/) of the [U.S. Department of Homeland Security](https://www.dhs.gov/). | ||
|
@@ -3863,4 +3856,4 @@ See [`License.txt`](./License.txt) for the terms of its release. | |
|
||
[[email protected]](mailto:[email protected]?subject=Malcolm) | ||
|
||
[![Join the chat at https://gitter.im/malcolmnetsec/community](https://badges.gitter.im/malcolmnetsec/community.svg)](https://gitter.im/malcolmnetsec/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) | ||
[![Join the chat at https://gitter.im/malcolmnetsec/community](https://badges.gitter.im/malcolmnetsec/community.svg)](https://gitter.im/malcolmnetsec/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) |
Oops, something went wrong.