Skip to content

Commit 3c0e2c6

Browse files
committed
licence: resolve rebase conflicts
1 parent 0ca79b7 commit 3c0e2c6

350 files changed

Lines changed: 2989 additions & 976 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/Containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: AGPL-3.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
# Copyright (c) {{CURRENT_YEAR}} {{AUTHOR}} ({{OWNER}}) <{{AUTHOR_EMAIL}}>
33
#
44
# Dev Container image for {{PROJECT_NAME}}

.devcontainer/README.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// SPDX-License-Identifier: AGPL-3.0-or-later
1+
// SPDX-License-Identifier: MPL-2.0
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

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: AGPL-3.0-or-later
1+
// SPDX-License-Identifier: MPL-2.0
22
// Copyright (c) {{CURRENT_YEAR}} Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
33
//
44
// Dev Container configuration for {{PROJECT_NAME}}

.envrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: AGPL-3.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
# Activate development environment
33
# Install direnv: https://direnv.net/
44

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: AGPL-3.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
# RSR-compliant .gitattributes
33

44
* text=auto eol=lf

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: AGPL-3.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
# CODEOWNERS - Define code review assignments
33
# See: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
44
#

.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: AGPL-3.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
labels: [enhancement]
33
body:
44
- type: textarea

0 commit comments

Comments
 (0)