From aaf8b1cc5c3b257d1af9376175f200ed2888c4ca Mon Sep 17 00:00:00 2001
From: dh00601 <dh00601@surrey.ac.uk>
Date: Sat, 18 Jun 2022 00:39:12 +0100
Subject: [PATCH] fixing merge with 0.9.3/2.2.1

---
 .gitmodules                       | 3 +++
 paper_joss_binarycpython          | 1 +
 papers/joss_paper/joss_paper_repo | 1 +
 3 files changed, 5 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 paper_joss_binarycpython
 create mode 160000 papers/joss_paper/joss_paper_repo

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..170d63ff4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "paper_joss_binarycpython"]
+	path = paper_joss_binarycpython
+	url = git@gitlab.com:dhendriks/paper_joss_binarycpython.git
diff --git a/paper_joss_binarycpython b/paper_joss_binarycpython
new file mode 160000
index 000000000..14f797c3c
--- /dev/null
+++ b/paper_joss_binarycpython
@@ -0,0 +1 @@
+Subproject commit 14f797c3c5f5f393f9b7dc246e31b1d7e3e291c8
diff --git a/papers/joss_paper/joss_paper_repo b/papers/joss_paper/joss_paper_repo
new file mode 160000
index 000000000..bfe1438e4
--- /dev/null
+++ b/papers/joss_paper/joss_paper_repo
@@ -0,0 +1 @@
+Subproject commit bfe1438e43d1f40a8fb4b3adf1f872a427854380
-- 
GitLab