Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
1
1weather
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitriy Stepanets
1weather
Commits
889114fc
Commit
889114fc
authored
Mar 15, 2021
by
Demid Merzlyakov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a typo in comments.
parent
41e13440
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
1Weather/Model/ModelObjects/Location.swift
+1
-1
No files found.
1Weather/Model/ModelObjects/Location.swift
View file @
889114fc
...
...
@@ -81,7 +81,7 @@ extension Location: UpdatableModelObject {
public
func
mergedWith
(
incrementalChanges
:
Location
)
->
Location
{
var
result
=
self
result
.
lastTimeUpdated
=
incrementalChanges
.
lastTimeUpdated
// The preferen
s
e is given to self values rather than incrementalChanges in this class
// The preferen
c
e is given to self values rather than incrementalChanges in this class
result
.
coordinates
=
result
.
coordinates
??
incrementalChanges
.
coordinates
result
.
imageName
=
result
.
imageName
??
incrementalChanges
.
imageName
result
.
countryCode
=
result
.
countryCode
??
incrementalChanges
.
countryCode
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment