Fix issues during merge

IssueID: OAM-62
Change-Id: I981d735eb9d150e201caa85b94cd2cf56fed5a37
Signed-off-by: demx8as6 <martin.skorupski@highstreet-technologies.com>

diff --git a/data-model/yang/working/o-ran-sc/near-rt-ric/iana-hardware.yang b/data-model/yang/working/o-ran-sc/near-rt-ric/iana-hardware.yang
new file mode 120000 (symlink)
index 0000000..dae14bb
--- /dev/null
+++ b/data-model/yang/working/o-ran-sc/near-rt-ric/iana-hardware.yang
@@ -0,0 +1 @@
+../template/iana-hardware.yang
\ No newline at end of file

diff --git a/data-model/yang/working/o-ran-sc/near-rt-ric/ietf-inet-types.yang b/data-model/yang/working/o-ran-sc/near-rt-ric/ietf-inet-types.yang
new file mode 120000 (symlink)
index 0000000..4ac7234
--- /dev/null
+++ b/data-model/yang/working/o-ran-sc/near-rt-ric/ietf-inet-types.yang
@@ -0,0 +1 @@
+../template/ietf-inet-types.yang
\ No newline at end of file

diff --git a/data-model/yang/working/o-ran-sc/o-ran-cu-cp/iana-hardware.yang b/data-model/yang/working/o-ran-sc/o-ran-cu-cp/iana-hardware.yang
new file mode 120000 (symlink)
index 0000000..dae14bb
--- /dev/null
+++ b/data-model/yang/working/o-ran-sc/o-ran-cu-cp/iana-hardware.yang
@@ -0,0 +1 @@
+../template/iana-hardware.yang
\ No newline at end of file

diff --git a/data-model/yang/working/o-ran-sc/o-ran-cu-cp/ietf-inet-types.yang b/data-model/yang/working/o-ran-sc/o-ran-cu-cp/ietf-inet-types.yang
new file mode 120000 (symlink)
index 0000000..4ac7234
--- /dev/null
+++ b/data-model/yang/working/o-ran-sc/o-ran-cu-cp/ietf-inet-types.yang
@@ -0,0 +1 @@
+../template/ietf-inet-types.yang
\ No newline at end of file

diff --git a/data-model/yang/working/o-ran-sc/o-ran-cu-up/iana-hardware.yang b/data-model/yang/working/o-ran-sc/o-ran-cu-up/iana-hardware.yang
new file mode 120000 (symlink)
index 0000000..dae14bb
--- /dev/null
+++ b/data-model/yang/working/o-ran-sc/o-ran-cu-up/iana-hardware.yang
@@ -0,0 +1 @@
+../template/iana-hardware.yang
\ No newline at end of file

diff --git a/data-model/yang/working/o-ran-sc/o-ran-cu-up/ietf-inet-types.yang b/data-model/yang/working/o-ran-sc/o-ran-cu-up/ietf-inet-types.yang
new file mode 120000 (symlink)
index 0000000..4ac7234
--- /dev/null
+++ b/data-model/yang/working/o-ran-sc/o-ran-cu-up/ietf-inet-types.yang
@@ -0,0 +1 @@
+../template/ietf-inet-types.yang
\ No newline at end of file

diff --git a/data-model/yang/working/o-ran-sc/o-ran-du/iana-hardware.yang b/data-model/yang/working/o-ran-sc/o-ran-du/iana-hardware.yang
new file mode 120000 (symlink)
index 0000000..dae14bb
--- /dev/null
+++ b/data-model/yang/working/o-ran-sc/o-ran-du/iana-hardware.yang
@@ -0,0 +1 @@
+../template/iana-hardware.yang
\ No newline at end of file

diff --git a/data-model/yang/working/o-ran-sc/o-ran-du/ietf-inet-types.yang b/data-model/yang/working/o-ran-sc/o-ran-du/ietf-inet-types.yang
new file mode 120000 (symlink)
index 0000000..4ac7234
--- /dev/null
+++ b/data-model/yang/working/o-ran-sc/o-ran-du/ietf-inet-types.yang
@@ -0,0 +1 @@
+../template/ietf-inet-types.yang
\ No newline at end of file

diff --git a/data-model/yang/working/o-ran-sc/o-ran-ru/iana-hardware.yang b/data-model/yang/working/o-ran-sc/o-ran-ru/iana-hardware.yang
new file mode 120000 (symlink)
index 0000000..dae14bb
--- /dev/null
+++ b/data-model/yang/working/o-ran-sc/o-ran-ru/iana-hardware.yang
@@ -0,0 +1 @@
+../template/iana-hardware.yang
\ No newline at end of file

diff --git a/data-model/yang/working/o-ran-sc/o-ran-ru/ietf-inet-types.yang b/data-model/yang/working/o-ran-sc/o-ran-ru/ietf-inet-types.yang
new file mode 120000 (symlink)
index 0000000..4ac7234
--- /dev/null
+++ b/data-model/yang/working/o-ran-sc/o-ran-ru/ietf-inet-types.yang
@@ -0,0 +1 @@
+../template/ietf-inet-types.yang
\ No newline at end of file

diff --git a/data-model/yang/working/o-ran-sc/template/iana-hardware.yang b/data-model/yang/working/o-ran-sc/template/iana-hardware.yang
new file mode 120000 (symlink)
index 0000000..39d3b0e
--- /dev/null
+++ b/data-model/yang/working/o-ran-sc/template/iana-hardware.yang
@@ -0,0 +1 @@
+../../../published/ietf/iana-hardware.yang
\ No newline at end of file

diff --git a/data-model/yang/working/o-ran-sc/template/ietf-inet-types.yang b/data-model/yang/working/o-ran-sc/template/ietf-inet-types.yang
new file mode 120000 (symlink)
index 0000000..9f90ca6
--- /dev/null
+++ b/data-model/yang/working/o-ran-sc/template/ietf-inet-types.yang
@@ -0,0 +1 @@
+../../../published/ietf/ietf-inet-types.yang
\ No newline at end of file