Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Team 5 - Smart Towns
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Rhys Evans
Team 5 - Smart Towns
Merge requests
!34
Resolve "As a user, I would like a town specific page which shows all trails for that town so that I can easily see my progress"
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Resolve "As a user, I would like a town specific page which shows all trails for that town so that I can easily see my progress"
69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can
into
main
Overview
1
Commits
31
Pipelines
0
Changes
19
Merged
Resolve "As a user, I would like a town specific page which shows all trails for that town so that I can easily see my progress"
Rhys Evans
requested to merge
69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can
into
main
Dec 6, 2023
Overview
1
Commits
31
Pipelines
0
Changes
19
Closes
#69 (closed)
0
0
Merge request reports
Compare
main
version 25
fdbc6797
Dec 14, 2023
version 24
3d1c7094
Dec 14, 2023
version 23
80ca37ba
Dec 14, 2023
version 22
91331444
Dec 14, 2023
version 21
33c726f3
Dec 14, 2023
version 20
726b6dbf
Dec 14, 2023
version 19
cc7832b5
Dec 14, 2023
version 18
7f5ec757
Dec 14, 2023
version 17
52db1c0f
Dec 13, 2023
version 16
61db88ee
Dec 13, 2023
version 15
6f558f5e
Dec 12, 2023
version 14
10ab2b64
Dec 12, 2023
version 13
e19fc137
Dec 12, 2023
version 12
7da4a777
Dec 11, 2023
version 11
518c6b09
Dec 8, 2023
version 10
7587d180
Dec 8, 2023
version 9
7aff5e43
Dec 8, 2023
version 8
c368545d
Dec 8, 2023
version 7
e20288a4
Dec 7, 2023
version 6
8e3769f5
Dec 7, 2023
version 5
694e717c
Dec 7, 2023
version 4
e321e10b
Dec 7, 2023
version 3
545d2602
Dec 7, 2023
version 2
2fa2e246
Dec 6, 2023
version 1
4d792c5d
Dec 6, 2023
main (base)
and
version 11
latest version
643669a9
31 commits,
Dec 14, 2023
version 25
fdbc6797
30 commits,
Dec 14, 2023
version 24
3d1c7094
29 commits,
Dec 14, 2023
version 23
80ca37ba
28 commits,
Dec 14, 2023
version 22
91331444
27 commits,
Dec 14, 2023
version 21
33c726f3
25 commits,
Dec 14, 2023
version 20
726b6dbf
22 commits,
Dec 14, 2023
version 19
cc7832b5
21 commits,
Dec 14, 2023
version 18
7f5ec757
20 commits,
Dec 14, 2023
version 17
52db1c0f
19 commits,
Dec 13, 2023
version 16
61db88ee
18 commits,
Dec 13, 2023
version 15
6f558f5e
17 commits,
Dec 12, 2023
version 14
10ab2b64
16 commits,
Dec 12, 2023
version 13
e19fc137
14 commits,
Dec 12, 2023
version 12
7da4a777
13 commits,
Dec 11, 2023
version 11
518c6b09
12 commits,
Dec 8, 2023
version 10
7587d180
11 commits,
Dec 8, 2023
version 9
7aff5e43
10 commits,
Dec 8, 2023
version 8
c368545d
9 commits,
Dec 8, 2023
version 7
e20288a4
8 commits,
Dec 7, 2023
version 6
8e3769f5
7 commits,
Dec 7, 2023
version 5
694e717c
6 commits,
Dec 7, 2023
version 4
e321e10b
5 commits,
Dec 7, 2023
version 3
545d2602
4 commits,
Dec 7, 2023
version 2
2fa2e246
2 commits,
Dec 6, 2023
version 1
4d792c5d
1 commit,
Dec 6, 2023
19 files
+
551
−
56
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
19
src/main/java/Team5/SmartTowns/Data/Calculator.java
0 → 100644
+
21
−
0
View file @ 518c6b09
Edit in single-file editor
Open in Web IDE
package
Team5.SmartTowns.Data
;
public
class
Calculator
{
public
int
divide
(
int
i
,
int
i1
)
{
return
i
/
i1
;
}
public
int
add
(
int
i
,
int
i1
){
return
i
+
i1
;
}
public
int
subtract
(
int
i
,
int
i1
){
return
i
-
i1
;
}
public
int
multiply
(
int
i
,
int
i1
){
return
i
*
i1
;
}
}
Loading