Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Progark gruppe 3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tobias Ingebrigt Ørstad
Progark gruppe 3
Merge requests
!107
Resolve "Adding comments"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Adding comments"
100-adding-comments
into
dev
Overview
0
Commits
1
Pipelines
0
Changes
34
Merged
Turid Cecilie Dahl
requested to merge
100-adding-comments
into
dev
5 years ago
Overview
0
Commits
1
Pipelines
0
Changes
34
Expand
Closes
#100 (closed)
Edited
5 years ago
by
Turid Cecilie Dahl
0
0
Merge request reports
Compare
dev
dev (base)
and
latest version
latest version
f4ea40c7
1 commit,
5 years ago
34 files
+
297
−
61
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
34
Search (e.g. *.vue) (Ctrl+P)
frontend/android/assets/config.json
+
3
−
3
Options
@@ -8,15 +8,15 @@
"games"
:
[
{
"id"
:
"5e90541aeba599f7b1bffceb"
,
"class"
:
"com.gameware.game.states.FruitSlicerState"
"class"
:
"com.gameware.game.states.
games.
FruitSlicerState"
},
{
"id"
:
"5e5d0efaa6e2bc5cb4920b7a"
,
"class"
:
"com.gameware.game.states.ColorRushState"
"class"
:
"com.gameware.game.states.
games.
ColorRushState"
},
{
"id"
:
"5e5d0f1ea6e2bc5cb4920b7b"
,
"class"
:
"com.gameware.game.states.BubbleWrapState"
"class"
:
"com.gameware.game.states.
games.
BubbleWrapState"
}
]
}
Loading