Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
8438aca
wip
inesp Feb 25, 2020
171e1b0
wip
inesp Feb 25, 2020
8f9f57c
wip
Feb 25, 2020
692eab7
wip
Feb 25, 2020
efeb05a
wip
Feb 25, 2020
ae390e2
wip - sre feb 26 11:30:45 CET 2020
Feb 26, 2020
356fb0d
wip - sre feb 26 11:32:15 CET 2020
Feb 26, 2020
bbf7cc7
wip - sre feb 26 13:20:36 CET 2020
Feb 26, 2020
e82fe41
wip - sre feb 26 13:21:02 CET 2020
Feb 26, 2020
4ab8263
wip - sre feb 26 13:21:42 CET 2020
Feb 26, 2020
6ed7ccf
wip - sre feb 26 13:22:45 CET 2020
Feb 26, 2020
f1d52ef
wip - čet feb 27 15:38:09 CET 2020
Feb 27, 2020
cfb73e2
wip - čet feb 27 15:41:24 CET 2020
Feb 27, 2020
26f9418
wip - čet feb 27 15:42:05 CET 2020
Feb 27, 2020
8e5187f
wip - čet feb 27 15:42:38 CET 2020
Feb 27, 2020
cd1f451
wip - čet feb 27 15:43:22 CET 2020
Feb 27, 2020
c81cfdb
wip - čet feb 27 15:43:54 CET 2020
Feb 27, 2020
d71e363
wip - pet feb 28 14:55:58 CET 2020
Feb 28, 2020
95bd9d9
wip - pon mar 2 10:21:30 CET 2020
Mar 2, 2020
4c6f9a2
One
Mar 2, 2020
ec32c76
Two
Mar 2, 2020
c767692
Merge pull request #5 from inesp/pr-branch
inesp Mar 2, 2020
a3284ac
One
inesp Mar 2, 2020
6f7fbab
Two
inesp Mar 2, 2020
b6490f0
Merge pull request #7 from inesp/pr-branch-2
inesp Mar 2, 2020
d9fe453
3
inesp Mar 2, 2020
808915d
Merge pull request #8 from inesp/pr-branch-3
inesp Mar 2, 2020
405916b
wip - pon mar 2 10:39:59 CET 2020
inesp Mar 2, 2020
9920489
wip - pon mar 2 10:42:50 CET 2020
inesp Mar 2, 2020
fb847ec
wip - pon mar 2 10:53:44 CET 2020
inesp Mar 2, 2020
5282b17
wip - pon mar 2 11:01:21 CET 2020
inesp Mar 2, 2020
7d212c6
wip - sre mar 4 14:24:17 CET 2020
inesp Mar 4, 2020
7d4ef6f
wip
inesp Mar 25, 2020
a681a46
wip
inesp Mar 26, 2020
148f088
wip
inesp Mar 26, 2020
2f4d64a
wip
inesp Mar 26, 2020
55e21ff
wip
inesp Mar 26, 2020
b8dd0fc
wip
inesp Mar 26, 2020
82a7c93
wip
inesp Mar 26, 2020
bd07a5e
wip
inesp Mar 26, 2020
aa81fcd
wip
inesp Mar 26, 2020
d5422a4
NN
inesp Mar 26, 2020
c0cc517
NN
inesp Mar 26, 2020
6cdbf99
NN
inesp Mar 26, 2020
edcb3a8
NN
inesp Mar 26, 2020
ae8a3d3
NN
inesp Mar 26, 2020
f08424c
NN
inesp Mar 26, 2020
10bacaa
NN
inesp Mar 26, 2020
b424a42
NN
inesp Mar 26, 2020
a9fb0fc
NN
inesp Mar 26, 2020
f8e1ded
NN
inesp Mar 26, 2020
4c66918
New file from alec
alecseni Apr 3, 2020
b5a1931
Merge pull request #15 from inesp/as1
alecseni Apr 3, 2020
03a4835
Ines file
inesp Apr 3, 2020
cc0e02e
Alec 2
alecseni Apr 3, 2020
6301694
Merge pull request #16 from inesp/alecseni-patch-1
inesp Apr 3, 2020
bf241d3
Alec 3
alecseni Apr 3, 2020
199a3dc
Merge pull request #17 from inesp/alecseni-patch-3
alecseni Apr 3, 2020
497a1bf
Created something
alecseni Apr 6, 2020
7044eeb
Added
inesp Apr 6, 2020
8382fa3
Merge pull request #18 from inesp/alecseni-patch-2
alecseni Apr 6, 2020
7d6f4f6
bla
inesp Apr 9, 2020
40ecaf9
wip
inesp Apr 21, 2020
1dd5206
wip
inesp Apr 21, 2020
e357d2f
wip
inesp Apr 28, 2020
879ad5c
wip
inesp Apr 28, 2020
6bbbad7
wip
inesp May 5, 2020
5bbc4d6
Push this directly 3
inesp May 6, 2020
8c6eb13
second
inesp May 6, 2020
bc226f9
again
inesp May 6, 2020
4cbd573
wip
inesp May 25, 2020
3dd9f2a
Something
inesp May 25, 2020
c8ddaab
pr-1
inesp Jul 16, 2020
085116c
wip
inesp Jul 20, 2020
3498563
Merge pull request #20 from inesp/pr-1
inesp Aug 17, 2020
508755e
Merge pull request #21 from inesp/pr-2
inesp Aug 17, 2020
28450f1
New commit blab lab alba
inesp Aug 17, 2020
c93cfb8
Another commit bla blab al2
inesp Aug 17, 2020
1a16417
I am doing soemthing
inesp Aug 17, 2020
811663a
Merge pull request #22 from inesp/inesp-patch-1
inesp Aug 17, 2020
8f097c0
Bla bla commit
inesp Aug 17, 2020
d268228
Merge pull request #23 from inesp/inesp-patch-2
inesp Aug 17, 2020
448f7d6
Revert "SDEV-111: Bla bla commit"
inesp Aug 17, 2020
a5df6db
Merge pull request #24 from inesp/revert-23-inesp-patch-2
inesp Aug 17, 2020
98fd762
Revert "Revert "SDEV-111: Bla bla commit""
inesp Aug 17, 2020
98d17c3
Merge pull request #25 from inesp/revert-24-revert-23-inesp-patch-2
inesp Aug 17, 2020
66624f5
Another commit bla blab al2
inesp Aug 17, 2020
9774dd1
Another commit bla blab al2
inesp Aug 17, 2020
c7f0ca0
NEw bla blab
inesp Aug 17, 2020
c8711de
Merge pull request #26 from inesp/inesp-patch-3
inesp Aug 17, 2020
3b3289a
Revert "SDEV-10: NEw bla blab"
inesp Aug 17, 2020
c2a2749
Merge pull request #27 from inesp/revert-26-inesp-patch-3
inesp Aug 17, 2020
7209741
blabla
inesp Sep 14, 2020
70cef5f
Merge branch 'master' of github.com:inesp/testing
inesp Sep 14, 2020
0f6890a
wip
inesp Sep 14, 2020
86db05d
Pencil
inesp Sep 15, 2020
0a3cc9a
Pencil
inesp Sep 15, 2020
992f5ba
Pencil
inesp Sep 15, 2020
6560396
Bla on feature 992f5ba
inesp Sep 21, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions a.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
CCC
OOOOASADAFSDFD

ass

saaAAii
\nAAA - sre feb 26 11:30:45 CET 2020\n
\nAAA - sre feb 26 11:32:15 CET 2020\n
\nAAA - sre feb 26 13:20:36 CET 2020\n
\nAAA - sre feb 26 13:21:02 CET 2020\n
\nAAA - sre feb 26 13:21:42 CET 2020\n
\nAAA - sre feb 26 13:22:45 CET 2020\n
\nAAA - čet feb 27 15:38:09 CET 2020\n
\nAAA - čet feb 27 15:41:24 CET 2020\n
\nAAA - čet feb 27 15:42:05 CET 2020\n
\nAAA - čet feb 27 15:42:38 CET 2020\n
\nAAA - čet feb 27 15:43:22 CET 2020\n
\nAAA - čet feb 27 15:43:54 CET 2020\n
\nAAA - pet feb 28 14:55:58 CET 2020\n
\nAAA - pon mar 2 10:21:30 CET 2020\n
\nAAA - pon mar 2 10:39:59 CET 2020\n
\nAAA - pon mar 2 10:42:50 CET 2020\n
\nAAA - pon mar 2 10:53:44 CET 2020\n
\nAAA - pon mar 2 11:01:21 CET 2020\n
\nAAA - sre mar 4 14:24:17 CET 2020\n


ads
A
A
A
A
A
A
A
A
A
A
A
A
A
A
A
A
A
6 changes: 6 additions & 0 deletions alec_1
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
AAASDAsas
asdaasaNEW VVSADFG

asdasassaassdadasdAA

ŠŠŠŠ
7 changes: 7 additions & 0 deletions alec_2
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
asda<<<<<<< HEAD
qqqASASadasA c a
=======
ASASadasA c a

ADSA
>>>>>>> 98d17c38f874b2e9a37276cc70052dc831cb1716
2 changes: 2 additions & 0 deletions alec_3
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BLA
assaAlec 3
1 change: 1 addition & 0 deletions b
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
asasa
3 changes: 3 additions & 0 deletions b2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
BBB
AAAA
LKO
1 change: 1 addition & 0 deletions bb-testing
Submodule bb-testing added at 0c16a5
1 change: 1 addition & 0 deletions bla.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ASDASA
1 change: 1 addition & 0 deletions ines-file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Empty file added pr.br
Empty file.
Empty file added pr2
Empty file.
3 changes: 3 additions & 0 deletions something.something
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Something

Also, add this