From 53046b8d06ea6710022eedc76a2d6f0ceaa3c8fc Mon Sep 17 00:00:00 2001
From: Axel Galand <axel.galand@kanbios.fr>
Date: Fri, 13 Jan 2023 14:47:02 +0100
Subject: [PATCH] fix merge

---
 Assets/Models/hammer.prefab.meta | 7 +++++++
 Assets/Poses/Hammer.asset        | 8 --------
 2 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 Assets/Models/hammer.prefab.meta

diff --git a/Assets/Models/hammer.prefab.meta b/Assets/Models/hammer.prefab.meta
new file mode 100644
index 0000000..6ff590a
--- /dev/null
+++ b/Assets/Models/hammer.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fd5b13c999c2bf347b65add3dca90221
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Poses/Hammer.asset b/Assets/Poses/Hammer.asset
index a18de6b..8ae6345 100644
--- a/Assets/Poses/Hammer.asset
+++ b/Assets/Poses/Hammer.asset
@@ -21,11 +21,7 @@ MonoBehaviour:
     pinkyFingerMovementType: 0
     ignoreRootPoseData: 1
     ignoreWristPoseData: 1
-<<<<<<< Updated upstream
     position: {x: -0.004079017, y: 0.07426304, z: -0.014719886}
-=======
-    position: {x: -0.007730892, y: 0.119067214, z: 0.030084359}
->>>>>>> Stashed changes
     rotation: {x: -0.38252518, y: 0.011014178, z: -0.026590543, w: -0.9234967}
     bonePositions:
     - {x: -0, y: 0, z: 0}
@@ -100,11 +96,7 @@ MonoBehaviour:
     pinkyFingerMovementType: 0
     ignoreRootPoseData: 1
     ignoreWristPoseData: 1
-<<<<<<< Updated upstream
     position: {x: 0.004079017, y: 0.07426304, z: -0.014719886}
-=======
-    position: {x: 0.007838003, y: 0.12038135, z: 0.031398486}
->>>>>>> Stashed changes
     rotation: {x: 0.38252518, y: 0.011014178, z: -0.026590543, w: 0.9234967}
     bonePositions:
     - {x: -0, y: 0, z: 0}