Skip to content

Commit 9b721d5

Browse files
mblaschkemblaschke
committed
Merge pull request #50 from ipf/achtundvierzig
[BUGFIX] Remove merge-conflict artifacts
2 parents 87e5bf1 + 7dce146 commit 9b721d5

File tree

5 files changed

+5
-123
lines changed

5 files changed

+5
-123
lines changed

‎docker/httpd/ssl/server.crt‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,4 @@
11
-----BEGIN CERTIFICATE-----
2-
<<<<<<< HEAD
3-
MIIFEjCCAvoCCQDrKLkQ7ypcWzANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJE
4-
RTEQMA4GA1UECBMHR2VybWFueTEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRl
5-
MQ0wCwYDVQQDFAQqLnZtMB4XDTE1MDQyOTIxMDIyNloXDTE2MDQyODIxMDIyNlow
6-
SzELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0dlcm1hbnkxGzAZBgNVBAoTEkRvY2tl
7-
ciBCb2lsZXJwbGF0ZTENMAsGA1UEAxQEKi52bTCCAiIwDQYJKoZIhvcNAQEBBQAD
8-
ggIPADCCAgoCggIBAMrdMhSLIO9d6VZ5j1VcyumO5m1ilVIOwAIumMVSEyew/n+I
9-
pPRVt5nKoe+bBmMCDgZjXR37JkN2C//F67Qc84Vu1HqkKnXR3W10sdm2jkLK7G7s
10-
hCwBWOcPoqjtcXC02Tv2joll8AVoYvjDkyiStWYK2ymewxkfv/vNTh/3pxsXf3Mu
11-
imem5cYPq3oMDxCPeDLR25pOOzjZthE36vAvNUoB6/32JDiQ8wmfi9Xr9eTqu2hL
12-
MLrsZDJVlhoXKmJwPVI22xGaARW+MIENuss6d5SJHB9/qrESxmLsfG/sEoWPiJRa
13-
cgjsr+c/tPq4EdCMc74WmwaRT2UIysJ5UUF7yQrP9xuF37ItTFfAA+vqBI4+bCfb
14-
fYbLi2jO+pkeltTGyDHuxPd6P0rrqHUPsn4GM0VZgzWFucLWvsf/FLsQHMFXypGh
15-
AJV7Twm5/nGyi5cVqQNyUtXj4v7VzGSnCwJAOXLmDe2b9MGoDY75kn5gdAMcqTMz
16-
KEuzqLRf8zmq8kGIuDUYtMJLbSulDmBdMQa4g2oeDBdBaRQ7puGBJip0cZffNtnn
17-
6pakjh66Ld0dnUuXRUfohylvs5FNDCFzpbwoGXJuyxg9KUY4QEZSNgY2F6jP0Wmh
18-
KTEKKz4/xk0q2uak+ipK7R444YU4UcbTZ46A9XFLCsN430xUmjsE/KwYwcmZAgMB
19-
AAEwDQYJKoZIhvcNAQEFBQADggIBAFTME/oRGve/m2FZsmYEkLOWpJzcumwswWNX
20-
4o402nrYldYQ0q0reTHACb3H/F27nuNLVPbVAq14qHFw0MZojK6G8kaDNWL47XPA
21-
VfQh0kaJoCD/F+devRwv3z+tVSatXAm17fMdzZWNxa2v6i9QGLCBV26EUFWiK8zL
22-
5F5dmPEPx7rRj3NRGUPXwSt5wQH+wmqcJ+ut+gVJhTV7RRVgPraFsPIa9yK/pDDE
23-
fGlMzUqKUKGwoY9V+KB0WKZoAmD6qleNbAP6jx7F2DA1NxSbL79q65R43YsOLzJg
24-
hPqZYCs9OFz8BtgAL+SPJ5jAwwWwO/8BEqXZy7AYc4p7UEMyX5861xG7yDEFnUBe
25-
NiA8m92KLpRfeqLmBjVFEIHWyX1H3Fb1OgUx1TY2+itRhV5B5cKgv4MvQZ+9/kI2
26-
UQvNlkAxf3MJeIw8Vcxq6ADu4d8aqjtA9qZ7mhP7NwSvQJ0RHhAmcmqt02qIPsQA
27-
rURpmpCRUiVIuq6noJtSFmKc/zLWXyv8ypofX9JHKtFiJr6DpxrzTtMABLLFMEQx
28-
kOnuIz7e9Mj/CMoXp68U4MBYhuoapd0u+tv3lXvZSxTdioLJtecG6qc6ZYoTGB7a
29-
BNAo1sCRQrae0LPt2TAMXos6EA+pqX6WyKrAcopQidy3UMp2PCRXfUgtVPwdiq82
30-
BAleAIzC
31-
=======
322
MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
333
b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
344
WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
@@ -55,5 +25,4 @@ nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
5525
4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
5626
VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
5727
ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
58-
>>>>>>> release/3.3.0
59-
-----END CERTIFICATE-----
28+
-----END CERTIFICATE-----

‎docker/httpd/ssl/server.csr‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,4 @@
11
-----BEGIN CERTIFICATE REQUEST-----
2-
<<<<<<< HEAD
3-
MIIEkDCCAngCAQAwSzELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0dlcm1hbnkxGzAZ
4-
BgNVBAoTEkRvY2tlciBCb2lsZXJwbGF0ZTENMAsGA1UEAxQEKi52bTCCAiIwDQYJ
5-
KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMrdMhSLIO9d6VZ5j1VcyumO5m1ilVIO
6-
wAIumMVSEyew/n+IpPRVt5nKoe+bBmMCDgZjXR37JkN2C//F67Qc84Vu1HqkKnXR
7-
3W10sdm2jkLK7G7shCwBWOcPoqjtcXC02Tv2joll8AVoYvjDkyiStWYK2ymewxkf
8-
v/vNTh/3pxsXf3Muimem5cYPq3oMDxCPeDLR25pOOzjZthE36vAvNUoB6/32JDiQ
9-
8wmfi9Xr9eTqu2hLMLrsZDJVlhoXKmJwPVI22xGaARW+MIENuss6d5SJHB9/qrES
10-
xmLsfG/sEoWPiJRacgjsr+c/tPq4EdCMc74WmwaRT2UIysJ5UUF7yQrP9xuF37It
11-
TFfAA+vqBI4+bCfbfYbLi2jO+pkeltTGyDHuxPd6P0rrqHUPsn4GM0VZgzWFucLW
12-
vsf/FLsQHMFXypGhAJV7Twm5/nGyi5cVqQNyUtXj4v7VzGSnCwJAOXLmDe2b9MGo
13-
DY75kn5gdAMcqTMzKEuzqLRf8zmq8kGIuDUYtMJLbSulDmBdMQa4g2oeDBdBaRQ7
14-
puGBJip0cZffNtnn6pakjh66Ld0dnUuXRUfohylvs5FNDCFzpbwoGXJuyxg9KUY4
15-
QEZSNgY2F6jP0WmhKTEKKz4/xk0q2uak+ipK7R444YU4UcbTZ46A9XFLCsN430xU
16-
mjsE/KwYwcmZAgMBAAGgADANBgkqhkiG9w0BAQUFAAOCAgEAKcMX/U07W0h/34Vd
17-
ZTTFYq8D7aBdVM/sOQcRgXHCEIQgUt/DXmRKy1il5bQV8WK9FauCrmW1nJx3btHY
18-
vkAvX4eJ1te04tpDkojOcjYihZAtIzPivjGcopWzrxBCwGGiqyEcmDjVdF7qDcUC
19-
wkmtqzium9HveWgY6xDHpxuPyYuBbvZO407/cljHMgWRFOE0PG6GX48gLwc99lCS
20-
oLvKDDd7Rrqr2jA4m5tJd77D7L3LL/Yk3PTZRhJS3HIzs+kAtzzxP7dj6GRlVaQo
21-
uXr9C5qAdvWaDXcPaoH88IUEXPqRre75MTJtSXCUYPlXTVWNZ78JgnsFMcbsyyLn
22-
fB/CUEK9WyIMc5VtCUkcujO506sO7gYGmIKUhJ03Re5SSUmHRIE5vWUCvtjflvFv
23-
bh89SyS5bPmqDPR8jKktTG27F716rbPqr/B+uRacH4y5pfHoES0z42WJ9D07VSFH
24-
gVhmjNDxeqRPt1zFrzT1gMjZpKdHeBv7FRAY+cWRAIA56jwD9+oF7StjPM9ULpGp
25-
jLteqTMTDIxkJhMMKU2BAetOXbgl4bXdDn4rA83egE9obzAZoir9TYZ02zCM/c1q
26-
ioNcDgcXSxn3pDe/WyCJ7UicdGMd7K4kGMFCgXuNPbUTYn/yaBUkx9oiR9IBefS0
27-
UK8j6kHBk70h0P0xVIbqVGbJLWM=
28-
=======
292
MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
303
VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
314
713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
@@ -50,5 +23,4 @@ TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
5023
C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
5124
7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
5225
2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
53-
>>>>>>> release/3.3.0
54-
-----END CERTIFICATE REQUEST-----
26+
-----END CERTIFICATE REQUEST-----

‎docker/httpd/ssl/server.key‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn
4848
ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5
4949
K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS
5050
mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8=
51-
-----END RSA PRIVATE KEY-----
51+
-----END RSA PRIVATE KEY-----

‎docker/nginx/ssl/server.crt‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,4 @@
11
-----BEGIN CERTIFICATE-----
2-
<<<<<<< HEAD
3-
MIIFEjCCAvoCCQDrKLkQ7ypcWzANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJE
4-
RTEQMA4GA1UECBMHR2VybWFueTEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRl
5-
MQ0wCwYDVQQDFAQqLnZtMB4XDTE1MDQyOTIxMDIyNloXDTE2MDQyODIxMDIyNlow
6-
SzELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0dlcm1hbnkxGzAZBgNVBAoTEkRvY2tl
7-
ciBCb2lsZXJwbGF0ZTENMAsGA1UEAxQEKi52bTCCAiIwDQYJKoZIhvcNAQEBBQAD
8-
ggIPADCCAgoCggIBAMrdMhSLIO9d6VZ5j1VcyumO5m1ilVIOwAIumMVSEyew/n+I
9-
pPRVt5nKoe+bBmMCDgZjXR37JkN2C//F67Qc84Vu1HqkKnXR3W10sdm2jkLK7G7s
10-
hCwBWOcPoqjtcXC02Tv2joll8AVoYvjDkyiStWYK2ymewxkfv/vNTh/3pxsXf3Mu
11-
imem5cYPq3oMDxCPeDLR25pOOzjZthE36vAvNUoB6/32JDiQ8wmfi9Xr9eTqu2hL
12-
MLrsZDJVlhoXKmJwPVI22xGaARW+MIENuss6d5SJHB9/qrESxmLsfG/sEoWPiJRa
13-
cgjsr+c/tPq4EdCMc74WmwaRT2UIysJ5UUF7yQrP9xuF37ItTFfAA+vqBI4+bCfb
14-
fYbLi2jO+pkeltTGyDHuxPd6P0rrqHUPsn4GM0VZgzWFucLWvsf/FLsQHMFXypGh
15-
AJV7Twm5/nGyi5cVqQNyUtXj4v7VzGSnCwJAOXLmDe2b9MGoDY75kn5gdAMcqTMz
16-
KEuzqLRf8zmq8kGIuDUYtMJLbSulDmBdMQa4g2oeDBdBaRQ7puGBJip0cZffNtnn
17-
6pakjh66Ld0dnUuXRUfohylvs5FNDCFzpbwoGXJuyxg9KUY4QEZSNgY2F6jP0Wmh
18-
KTEKKz4/xk0q2uak+ipK7R444YU4UcbTZ46A9XFLCsN430xUmjsE/KwYwcmZAgMB
19-
AAEwDQYJKoZIhvcNAQEFBQADggIBAFTME/oRGve/m2FZsmYEkLOWpJzcumwswWNX
20-
4o402nrYldYQ0q0reTHACb3H/F27nuNLVPbVAq14qHFw0MZojK6G8kaDNWL47XPA
21-
VfQh0kaJoCD/F+devRwv3z+tVSatXAm17fMdzZWNxa2v6i9QGLCBV26EUFWiK8zL
22-
5F5dmPEPx7rRj3NRGUPXwSt5wQH+wmqcJ+ut+gVJhTV7RRVgPraFsPIa9yK/pDDE
23-
fGlMzUqKUKGwoY9V+KB0WKZoAmD6qleNbAP6jx7F2DA1NxSbL79q65R43YsOLzJg
24-
hPqZYCs9OFz8BtgAL+SPJ5jAwwWwO/8BEqXZy7AYc4p7UEMyX5861xG7yDEFnUBe
25-
NiA8m92KLpRfeqLmBjVFEIHWyX1H3Fb1OgUx1TY2+itRhV5B5cKgv4MvQZ+9/kI2
26-
UQvNlkAxf3MJeIw8Vcxq6ADu4d8aqjtA9qZ7mhP7NwSvQJ0RHhAmcmqt02qIPsQA
27-
rURpmpCRUiVIuq6noJtSFmKc/zLWXyv8ypofX9JHKtFiJr6DpxrzTtMABLLFMEQx
28-
kOnuIz7e9Mj/CMoXp68U4MBYhuoapd0u+tv3lXvZSxTdioLJtecG6qc6ZYoTGB7a
29-
BNAo1sCRQrae0LPt2TAMXos6EA+pqX6WyKrAcopQidy3UMp2PCRXfUgtVPwdiq82
30-
BAleAIzC
31-
=======
322
MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
333
b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
344
WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
@@ -55,5 +25,4 @@ nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
5525
4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
5626
VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
5727
ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
58-
>>>>>>> release/3.3.0
59-
-----END CERTIFICATE-----
28+
-----END CERTIFICATE-----

‎docker/nginx/ssl/server.csr‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,4 @@
11
-----BEGIN CERTIFICATE REQUEST-----
2-
<<<<<<< HEAD
3-
MIIEkDCCAngCAQAwSzELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0dlcm1hbnkxGzAZ
4-
BgNVBAoTEkRvY2tlciBCb2lsZXJwbGF0ZTENMAsGA1UEAxQEKi52bTCCAiIwDQYJ
5-
KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMrdMhSLIO9d6VZ5j1VcyumO5m1ilVIO
6-
wAIumMVSEyew/n+IpPRVt5nKoe+bBmMCDgZjXR37JkN2C//F67Qc84Vu1HqkKnXR
7-
3W10sdm2jkLK7G7shCwBWOcPoqjtcXC02Tv2joll8AVoYvjDkyiStWYK2ymewxkf
8-
v/vNTh/3pxsXf3Muimem5cYPq3oMDxCPeDLR25pOOzjZthE36vAvNUoB6/32JDiQ
9-
8wmfi9Xr9eTqu2hLMLrsZDJVlhoXKmJwPVI22xGaARW+MIENuss6d5SJHB9/qrES
10-
xmLsfG/sEoWPiJRacgjsr+c/tPq4EdCMc74WmwaRT2UIysJ5UUF7yQrP9xuF37It
11-
TFfAA+vqBI4+bCfbfYbLi2jO+pkeltTGyDHuxPd6P0rrqHUPsn4GM0VZgzWFucLW
12-
vsf/FLsQHMFXypGhAJV7Twm5/nGyi5cVqQNyUtXj4v7VzGSnCwJAOXLmDe2b9MGo
13-
DY75kn5gdAMcqTMzKEuzqLRf8zmq8kGIuDUYtMJLbSulDmBdMQa4g2oeDBdBaRQ7
14-
puGBJip0cZffNtnn6pakjh66Ld0dnUuXRUfohylvs5FNDCFzpbwoGXJuyxg9KUY4
15-
QEZSNgY2F6jP0WmhKTEKKz4/xk0q2uak+ipK7R444YU4UcbTZ46A9XFLCsN430xU
16-
mjsE/KwYwcmZAgMBAAGgADANBgkqhkiG9w0BAQUFAAOCAgEAKcMX/U07W0h/34Vd
17-
ZTTFYq8D7aBdVM/sOQcRgXHCEIQgUt/DXmRKy1il5bQV8WK9FauCrmW1nJx3btHY
18-
vkAvX4eJ1te04tpDkojOcjYihZAtIzPivjGcopWzrxBCwGGiqyEcmDjVdF7qDcUC
19-
wkmtqzium9HveWgY6xDHpxuPyYuBbvZO407/cljHMgWRFOE0PG6GX48gLwc99lCS
20-
oLvKDDd7Rrqr2jA4m5tJd77D7L3LL/Yk3PTZRhJS3HIzs+kAtzzxP7dj6GRlVaQo
21-
uXr9C5qAdvWaDXcPaoH88IUEXPqRre75MTJtSXCUYPlXTVWNZ78JgnsFMcbsyyLn
22-
fB/CUEK9WyIMc5VtCUkcujO506sO7gYGmIKUhJ03Re5SSUmHRIE5vWUCvtjflvFv
23-
bh89SyS5bPmqDPR8jKktTG27F716rbPqr/B+uRacH4y5pfHoES0z42WJ9D07VSFH
24-
gVhmjNDxeqRPt1zFrzT1gMjZpKdHeBv7FRAY+cWRAIA56jwD9+oF7StjPM9ULpGp
25-
jLteqTMTDIxkJhMMKU2BAetOXbgl4bXdDn4rA83egE9obzAZoir9TYZ02zCM/c1q
26-
ioNcDgcXSxn3pDe/WyCJ7UicdGMd7K4kGMFCgXuNPbUTYn/yaBUkx9oiR9IBefS0
27-
UK8j6kHBk70h0P0xVIbqVGbJLWM=
28-
=======
292
MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
303
VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
314
713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
@@ -50,5 +23,4 @@ TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
5023
C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
5124
7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
5225
2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
53-
>>>>>>> release/3.3.0
54-
-----END CERTIFICATE REQUEST-----
26+
-----END CERTIFICATE REQUEST-----

0 commit comments

Comments
 (0)