Skip to content

Commit ae24e6d

Browse files
committed
Resolve AGPL license sweep conflicts with main
2 parents 1a423b2 + 5e4f691 commit ae24e6d

196 files changed

Lines changed: 2727 additions & 3371 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/README.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// SPDX-License-Identifier: AGPL-3.0-or-later
2+
// Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
23
= Dev Container Usage
34
:author: Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
45

.envrc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ fi
2020
# Project environment variables
2121
export PROJECT_NAME="{{PROJECT_NAME}}"
2222
export RSR_TIER="infrastructure"
23-
# export DATABASE_URL="..."
24-
# export API_KEY="..."
2523

2624
# Source .env if it exists (gitignored)
2725
dotenv_if_exists

.github/CODE_OF_CONDUCT.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<!--
2+
SPDX-License-Identifier: MPL-2.0
3+
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
4+
-->
15
# Code of Conduct
26

37
<!--

.github/CONTRIBUTING.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<!--
2+
SPDX-License-Identifier: MPL-2.0
3+
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
4+
-->
15
# Clone the repository
26
git clone https://github.com/hyperpolymath/rattlescript.git
37
cd rattlescript
@@ -32,7 +36,7 @@ rattlescript/
3236
├── .machine_readable/ # ALL machine-readable content (Perimeter 1)
3337
│ ├── *.a2ml # State files (STATE, META, ECOSYSTEM, etc.)
3438
│ ├── bot_directives/ # Bot configs
35-
│ └── contractiles/ # Policy contracts (k9, dust, lust, must, trust)
39+
│ └── contractiles/ # Policy contracts (k9, dust, intend, must, trust)
3640
├── .well-known/ # Protocol files (Perimeter 1-3)
3741
├── .github/ # GitHub config (Perimeter 1)
3842
│ ├── ISSUE_TEMPLATE/

.github/DIRECTORY.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
// SPDX-License-Identifier: MPL-2.0
2+
// Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
13
= .github Pillar

.github/DISCUSSION_TEMPLATE/ideas.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/DISCUSSION_TEMPLATE/q-and-a.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/GOVERNANCE.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
<!-- SPDX-License-Identifier: AGPL-3.0-or-later -->
2-
1+
<!--
2+
SPDX-License-Identifier: AGPL-3.0-or-later
3+
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
4+
-->
35
# Project Governance
46

57
This document describes the governance model for **{{PROJECT_NAME}}**.

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 0 additions & 127 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)