autorecovery: commit resolved merge (after rebase to m71)

53 files changed, 0 insertions, 0 deletions

diff --git a/ooo_custom_images/industrial/res/lc10713.png b/ooo_custom_images/industrial/lc10713.png
index 415f6609b3cc..415f6609b3cc 100644
--- a/ooo_custom_images/industrial/res/lc10713.png
+++ b/ooo_custom_images/industrial/lc10713.png
diff --git a/ooo_custom_images/industrial/res/lc10616.png b/ooo_custom_images/industrial/res/lc10616.png
deleted file mode 100644
index 41fc82eb8d8c..000000000000
--- a/ooo_custom_images/industrial/res/lc10616.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/lc10617.png b/ooo_custom_images/industrial/res/lc10617.png
deleted file mode 100644
index d301b68eeeaa..000000000000
--- a/ooo_custom_images/industrial/res/lc10617.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/lc10618.png b/ooo_custom_images/industrial/res/lc10618.png
deleted file mode 100644
index 9a3a52fdcdd9..000000000000
--- a/ooo_custom_images/industrial/res/lc10618.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/lc10619.png b/ooo_custom_images/industrial/res/lc10619.png
deleted file mode 100644
index 3c46d3a5e046..000000000000
--- a/ooo_custom_images/industrial/res/lc10619.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/lc10620.png b/ooo_custom_images/industrial/res/lc10620.png
deleted file mode 100644
index 57f243c52c12..000000000000
--- a/ooo_custom_images/industrial/res/lc10620.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/lc10621.png b/ooo_custom_images/industrial/res/lc10621.png
deleted file mode 100644
index 42c7853176e7..000000000000
--- a/ooo_custom_images/industrial/res/lc10621.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/lc10627.png b/ooo_custom_images/industrial/res/lc10627.png
deleted file mode 100644
index 621e05a5f628..000000000000
--- a/ooo_custom_images/industrial/res/lc10627.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/lc10630.png b/ooo_custom_images/industrial/res/lc10630.png
deleted file mode 100644
index 4896523df16f..000000000000
--- a/ooo_custom_images/industrial/res/lc10630.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/lc10712.png b/ooo_custom_images/industrial/res/lc10712.png
deleted file mode 100644
index 66af218675a8..000000000000
--- a/ooo_custom_images/industrial/res/lc10712.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/lc10714.png b/ooo_custom_images/industrial/res/lc10714.png
deleted file mode 100644
index aba330f0180b..000000000000
--- a/ooo_custom_images/industrial/res/lc10714.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/lc10723.png b/ooo_custom_images/industrial/res/lc10723.png
deleted file mode 100644
index 14ce6034e5e4..000000000000
--- a/ooo_custom_images/industrial/res/lc10723.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/lc10724.png b/ooo_custom_images/industrial/res/lc10724.png
deleted file mode 100644
index 814d0c4c1636..000000000000
--- a/ooo_custom_images/industrial/res/lc10724.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/sc10616.png b/ooo_custom_images/industrial/res/sc10616.png
deleted file mode 100644
index c8fc0a22012c..000000000000
--- a/ooo_custom_images/industrial/res/sc10616.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/sc10617.png b/ooo_custom_images/industrial/res/sc10617.png
deleted file mode 100644
index f31445e09c02..000000000000
--- a/ooo_custom_images/industrial/res/sc10617.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/sc10618.png b/ooo_custom_images/industrial/res/sc10618.png
deleted file mode 100644
index 4876bd4193e1..000000000000
--- a/ooo_custom_images/industrial/res/sc10618.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/sc10619.png b/ooo_custom_images/industrial/res/sc10619.png
deleted file mode 100644
index 28a6db3f4292..000000000000
--- a/ooo_custom_images/industrial/res/sc10619.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/sc10620.png b/ooo_custom_images/industrial/res/sc10620.png
deleted file mode 100644
index 1cb5a75cb7b8..000000000000
--- a/ooo_custom_images/industrial/res/sc10620.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/sc10621.png b/ooo_custom_images/industrial/res/sc10621.png
deleted file mode 100644
index 08923da25fe5..000000000000
--- a/ooo_custom_images/industrial/res/sc10621.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/sc10627.png b/ooo_custom_images/industrial/res/sc10627.png
deleted file mode 100644
index c939992c76b2..000000000000
--- a/ooo_custom_images/industrial/res/sc10627.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/sc10630.png b/ooo_custom_images/industrial/res/sc10630.png
deleted file mode 100644
index ec4407222430..000000000000
--- a/ooo_custom_images/industrial/res/sc10630.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/sc10712.png b/ooo_custom_images/industrial/res/sc10712.png
deleted file mode 100644
index dda7cd8c98e3..000000000000
--- a/ooo_custom_images/industrial/res/sc10712.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/sc10714.png b/ooo_custom_images/industrial/res/sc10714.png
deleted file mode 100644
index 8df4f8517b9e..000000000000
--- a/ooo_custom_images/industrial/res/sc10714.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/sc10723.png b/ooo_custom_images/industrial/res/sc10723.png
deleted file mode 100644
index e8dbea9bef2f..000000000000
--- a/ooo_custom_images/industrial/res/sc10723.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/sc10724.png b/ooo_custom_images/industrial/res/sc10724.png
deleted file mode 100644
index 5b46013f9f20..000000000000
--- a/ooo_custom_images/industrial/res/sc10724.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/res/sc10713.png b/ooo_custom_images/industrial/sc10713.png
index 5da3e8120884..5da3e8120884 100644
--- a/ooo_custom_images/industrial/res/sc10713.png
+++ b/ooo_custom_images/industrial/sc10713.png
diff --git a/ooo_custom_images/tango/res/lc10713.png b/ooo_custom_images/tango/lc10713.png
index c18733cf1528..c18733cf1528 100644
--- a/ooo_custom_images/tango/res/lc10713.png
+++ b/ooo_custom_images/tango/lc10713.png
diff --git a/ooo_custom_images/tango/res/lc10616.png b/ooo_custom_images/tango/res/lc10616.png
deleted file mode 100644
index 27e7b1d4ce0c..000000000000
--- a/ooo_custom_images/tango/res/lc10616.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/lc10617.png b/ooo_custom_images/tango/res/lc10617.png
deleted file mode 100644
index 1fadca11b55c..000000000000
--- a/ooo_custom_images/tango/res/lc10617.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/lc10618.png b/ooo_custom_images/tango/res/lc10618.png
deleted file mode 100644
index a473e22187c6..000000000000
--- a/ooo_custom_images/tango/res/lc10618.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/lc10619.png b/ooo_custom_images/tango/res/lc10619.png
deleted file mode 100644
index 682aa48ae7c5..000000000000
--- a/ooo_custom_images/tango/res/lc10619.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/lc10620.png b/ooo_custom_images/tango/res/lc10620.png
deleted file mode 100644
index 57f243c52c12..000000000000
--- a/ooo_custom_images/tango/res/lc10620.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/lc10621.png b/ooo_custom_images/tango/res/lc10621.png
deleted file mode 100644
index 42c7853176e7..000000000000
--- a/ooo_custom_images/tango/res/lc10621.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/lc10627.png b/ooo_custom_images/tango/res/lc10627.png
deleted file mode 100644
index 0dcb0361bb74..000000000000
--- a/ooo_custom_images/tango/res/lc10627.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/lc10630.png b/ooo_custom_images/tango/res/lc10630.png
deleted file mode 100644
index 4916fc905af4..000000000000
--- a/ooo_custom_images/tango/res/lc10630.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/lc10712.png b/ooo_custom_images/tango/res/lc10712.png
deleted file mode 100644
index 8246d5fc8e9a..000000000000
--- a/ooo_custom_images/tango/res/lc10712.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/lc10714.png b/ooo_custom_images/tango/res/lc10714.png
deleted file mode 100644
index 6be9c0ad117f..000000000000
--- a/ooo_custom_images/tango/res/lc10714.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/lc10723.png b/ooo_custom_images/tango/res/lc10723.png
deleted file mode 100644
index 380fd0cdc651..000000000000
--- a/ooo_custom_images/tango/res/lc10723.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/lc10724.png b/ooo_custom_images/tango/res/lc10724.png
deleted file mode 100644
index bce9f4d6bc29..000000000000
--- a/ooo_custom_images/tango/res/lc10724.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/lc10724.xcf.bz2 b/ooo_custom_images/tango/res/lc10724.xcf.bz2
deleted file mode 100644
index 658b4d4c984c..000000000000
--- a/ooo_custom_images/tango/res/lc10724.xcf.bz2
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/sc10616.png b/ooo_custom_images/tango/res/sc10616.png
deleted file mode 100644
index c8fc0a22012c..000000000000
--- a/ooo_custom_images/tango/res/sc10616.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/sc10617.png b/ooo_custom_images/tango/res/sc10617.png
deleted file mode 100644
index f31445e09c02..000000000000
--- a/ooo_custom_images/tango/res/sc10617.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/sc10618.png b/ooo_custom_images/tango/res/sc10618.png
deleted file mode 100644
index 4876bd4193e1..000000000000
--- a/ooo_custom_images/tango/res/sc10618.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/sc10619.png b/ooo_custom_images/tango/res/sc10619.png
deleted file mode 100644
index 28a6db3f4292..000000000000
--- a/ooo_custom_images/tango/res/sc10619.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/sc10620.png b/ooo_custom_images/tango/res/sc10620.png
deleted file mode 100644
index 1cb5a75cb7b8..000000000000
--- a/ooo_custom_images/tango/res/sc10620.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/sc10621.png b/ooo_custom_images/tango/res/sc10621.png
deleted file mode 100644
index 8cb6739ff95b..000000000000
--- a/ooo_custom_images/tango/res/sc10621.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/sc10627.png b/ooo_custom_images/tango/res/sc10627.png
deleted file mode 100644
index d901a6d137f6..000000000000
--- a/ooo_custom_images/tango/res/sc10627.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/sc10630.png b/ooo_custom_images/tango/res/sc10630.png
deleted file mode 100644
index bacdfb377577..000000000000
--- a/ooo_custom_images/tango/res/sc10630.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/sc10712.png b/ooo_custom_images/tango/res/sc10712.png
deleted file mode 100644
index db6cb6b9f952..000000000000
--- a/ooo_custom_images/tango/res/sc10712.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/sc10714.png b/ooo_custom_images/tango/res/sc10714.png
deleted file mode 100644
index b3115b6e6269..000000000000
--- a/ooo_custom_images/tango/res/sc10714.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/sc10723.png b/ooo_custom_images/tango/res/sc10723.png
deleted file mode 100644
index 5bd5f0e422ef..000000000000
--- a/ooo_custom_images/tango/res/sc10723.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/sc10724.png b/ooo_custom_images/tango/res/sc10724.png
deleted file mode 100644
index c7a16f532c5d..000000000000
--- a/ooo_custom_images/tango/res/sc10724.png
+++ /dev/null
diff --git a/ooo_custom_images/tango/res/sc10713.png b/ooo_custom_images/tango/sc10713.png
index 2650d6e13277..2650d6e13277 100644
--- a/ooo_custom_images/tango/res/sc10713.png
+++ b/ooo_custom_images/tango/sc10713.png