From ee94d8ed0b5a52b0e6c5d9787a33a51b80111c3d Mon Sep 17 00:00:00 2001 From: "andrew.greene" Date: Thu, 20 Jan 2022 16:35:13 -0700 Subject: [PATCH] Resolve merge conflicts on update from upstream --- CODE_OF_CONDUCT.md | 74 ---------------------------------------------- README.md | 1 + package.json | 20 ++++--------- 3 files changed, 7 insertions(+), 88 deletions(-) delete mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index b3c68063c..000000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,74 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, gender identity and expression, level of experience, -nationality, personal appearance, race, religion, or sexual identity and -orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or -advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at team@nodered.org. All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project team is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at [http://contributor-covenant.org/version/1/4][version] - -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ diff --git a/README.md b/README.md index 4f610e347..5eaef9af8 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ Sparkle's Guide is inspired by [roadmap.sh](https://roadmap.sh) and is a derivat ### To Code >coming soon... +1. `npm run dev` # auto load code changes ## Copyright and license diff --git a/package.json b/package.json index 618bef463..27849ee69 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { - "name": "node-red", - "version": "2.1.6", - "description": "Low-code programming for event-driven applications", - "homepage": "http://nodered.org", + "name": "sparkles-guide", + "version": "0.0.1", + "description": "a guide to sparkles and unicorns in the blessing on their magical journey to better themselves and each other.", + "homepage": "http://localhost:1880", "license": "Apache-2.0", "repository": { "type": "git", - "url": "https://github.com/node-red/node-red.git" + "url": "https://github.com/defenseunicorns/Sparkles-Guide.git" }, "private": "true", "scripts": { @@ -18,14 +18,6 @@ "build-dev": "grunt build-dev", "docs": "grunt docs" }, - "contributors": [ - { - "name": "Nick O'Leary" - }, - { - "name": "Dave Conway-Jones" - } - ], "dependencies": { "acorn": "8.7.0", "acorn-walk": "8.2.0", @@ -122,6 +114,6 @@ "supertest": "6.2.1" }, "engines": { - "node": ">=12" + "node": ">=16" } }