Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
K
KairDedmo
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
AJ-9
KairDedmo
Commits
2136d64b
Commit
2136d64b
authored
Nov 20, 2024
by
Kair
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://git.attractor-school.com/aj-9/25
into dev_kair2
parents
28e05d0c
74583af9
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
3 deletions
+20
-3
Hello.java
Model/Hello.java
+8
-0
Truck.java
Model/Truck.java
+8
-3
Program.java
Program.java
+4
-0
No files found.
Model/Hello.java
0 → 100644
View file @
2136d64b
package
Model
;
public
class
Hello
{
public
static
void
main
(
String
[]
args
)
{
//By zhenya
System
.
out
.
println
(
"Hello, world!"
);
}
}
Model/Truck.java
View file @
2136d64b
...
...
@@ -4,8 +4,13 @@ public class Truck {
// Comment
public
Truck
()
{
//Dev Kair
//20/11/2024
//1111111
// Some change with-out merge conflict
System
.
out
.
println
(
"..."
);
}
public
void
MyTruck
()
{
...
...
Program.java
View file @
2136d64b
...
...
@@ -5,5 +5,9 @@ public class Program {
//This is my new dev branch
////
//коммент от Айбека
//Ок ок ок
System
.
out
.
println
(
"Работа с тикетами )"
);
}
}
\ No newline at end of file
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