Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Andreas Nedbal
FarmingGame-web
Commits
252142dd
Commit
252142dd
authored
May 19, 2014
by
pixeldesu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:Leafcat/FarmingGame-web
parents
ad82c334
1b00477a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
js/main.js
js/main.js
+2
-2
No files found.
js/main.js
View file @
252142dd
...
...
@@ -34,12 +34,12 @@
},
sell
:
{
wheat
:
1
,
livestock
:
2
5
,
livestock
:
2
0
,
fields
:
200
,
cattleGrid
:
200
}
},
livestock
:
initItem
(
100
0
,
true
),
livestock
:
initItem
(
100
,
true
),
wheat
:
initItem
(
1000
,
true
)
};
...
...
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