Skip to content

Commit

Permalink
Fix whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
Ukendio committed Apr 23, 2024
1 parent 5ac0ea5 commit 9e975f6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
10 changes: 0 additions & 10 deletions docs/BestPractices/Reconciliation.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,6 @@ We can make a system that handles both of these cases for us.
for id, transformRecord in world:queryChanged(Transform) do

local model = world:get(id, Model)
<<<<<<< HEAD

=======

>>>>>>> 627635d72d2278846eacb4a446ee4a2e85817fa1
-- Take care to ignore the changed event if it was us that triggered it
if model and transformRecord.new and not transformRecord.new.doNotReconcile then
model.instance:SetPrimaryPartCFrame(transformRecord.new.cframe)
Expand All @@ -131,11 +126,6 @@ end
for id, modelRecord in world:queryChanged(Model) do

local transform = world:get(id, Transform)
<<<<<<< HEAD

=======

>>>>>>> 627635d72d2278846eacb4a446ee4a2e85817fa1
if transform and modelRecord.new then
modelRecord.new.model:SetPrimaryPartCFrame(transform.cframe)
end
Expand Down
2 changes: 1 addition & 1 deletion docs/Installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ registry = "https://github.com/UpliftGames/wally-index"
realm = "shared"

[dependencies]
matter = "evaera/matter@X.X.X" # Don't copy this. This won't work.
matter = "matter-ecs/matter@X.X.X" # Don't copy this. This won't work.
# Copy real string from page linked above.
```

Expand Down

0 comments on commit 9e975f6

Please sign in to comment.