Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
tp-4
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
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
pirkl-poo-2018
tp-4
Commits
40b4a0eb
Verified
Commit
40b4a0eb
authored
6 years ago
by
Théo Pirkl
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/gui-mq' into gui-mq
parents
26dd6d06
52ac8f67
No related branches found
No related tags found
1 merge request
!21
*poof* final version
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/ch/hepia/mq/DummyClass.java
+0
-16
0 additions, 16 deletions
src/main/java/ch/hepia/mq/DummyClass.java
src/main/java/ch/hepia/mq/TesterClass.java
+0
-14
0 additions, 14 deletions
src/main/java/ch/hepia/mq/TesterClass.java
with
0 additions
and
30 deletions
src/main/java/ch/hepia/mq/DummyClass.java
deleted
100644 → 0
+
0
−
16
View file @
26dd6d06
package
ch.hepia.mq
;
import
java.io.Serializable
;
public
class
DummyClass
implements
Serializable
{
private
static
final
long
serialVersionUID
=
0xAEF34565672
L
;
private
String
prop0
;
public
int
prop1
;
public
DummyClass
(){
this
.
prop0
=
"élè"
;
this
.
prop1
=
-
12
;
}
public
String
getProp0
(){
return
this
.
prop0
;
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/java/ch/hepia/mq/TesterClass.java
deleted
100644 → 0
+
0
−
14
View file @
26dd6d06
package
ch.hepia.mq
;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayOutputStream
;
import
java.io.ObjectInputStream
;
import
java.io.ObjectOutputStream
;
import
java.util.Arrays
;
import
java.util.function.Consumer
;
import
java.util.*
;
public
class
TesterClass
{
public
static
void
main
(
String
[]
argv
)
throws
Exception
{
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment