Merge remote-tracking branch 'origin/master' # Conflicts: # Zookeepers Trial/Assets/Scenes/mainScene1.unity # Zookeepers Trial/Library/CurrentLayout.dwlt # Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll # Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb # Zookeepers Trial/Library/assetDatabase3 # Zookeepers Trial/Library/metadata/00/00000000000000002000000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000003000000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000004100000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000005000000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000005100000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000006000000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000007000000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000007100000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000008000000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000008100000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000009000000000000000 # Zookeepers Trial/Library/metadata/00/0000000000000000a000000000000000 # Zookeepers Trial/Library/metadata/00/0000000000000000a100000000000000 # Zookeepers Trial/Library/metadata/00/0000000000000000b000000000000000 # Zookeepers Trial/Library/metadata/00/0000000000000000c000000000000000 # Zookeepers Trial/Library/metadata/cc/cc90e67fd939945489f1138d1179168d # # It looks like you may be committing a merge. # If this is not correct, please remove the file # .git/MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Committer: Graham Solie <Graham Solie> # # On branch master # Your branch and 'origin/master' have diverged, # and have 1 and 1 different commits each, respectively. # (use "git pull" to merge the remote branch into yours) # # All conflicts fixed but you are still merging. # # Changes to be committed: # modified: Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo # modified: Zookeepers Trial/Assembly-CSharp.csproj # new file: Zookeepers Trial/Assets/Art/Axes.png # new file: Zookeepers Trial/Assets/Art/Axes.png.meta # deleted: Zookeepers Trial/Assets/Art/Temporary Tests/idle0001.png # deleted: Zookeepers Trial/Assets/Art/Temporary Tests/idle0001.png.meta # new file: Zookeepers Trial/Assets/Scripts/Collisions.cs # new file: Zookeepers Trial/Assets/Scripts/Collisions.cs.meta # modified: Zookeepers Trial/Assets/Scripts/PlayerMovement.cs # new file: Zookeepers Trial/Assets/Weapons/Medium Axe.asset # new file: Zookeepers Trial/Assets/Weapons/Medium Axe.asset.meta # modified: Zookeepers Trial/Library/InspectorExpandedItems.asset # new file: Zookeepers Trial/Library/metadata/07/077bee65cdb03ed43ba1b81673a3ab84 # new file: Zookeepers Trial/Library/metadata/07/077bee65cdb03ed43ba1b81673a3ab84.info # new file: Zookeepers Trial/Library/metadata/2a/2a71b64752c736e428427f3c1a2d5ddd # new file: Zookeepers Trial/Library/metadata/2a/2a71b64752c736e428427f3c1a2d5ddd.info # new file: Zookeepers Trial/Library/metadata/2f/2f314a28f6904ef40a603c5d43803373 # new file: Zookeepers Trial/Library/metadata/2f/2f314a28f6904ef40a603c5d43803373.info # deleted: Zookeepers Trial/Library/metadata/ca/ca97e7994ebef314d81f1f2de0944976 # deleted: Zookeepers Trial/Library/metadata/ca/ca97e7994ebef314d81f1f2de0944976.info #