syntax error about cat

[restena-sw]

Hi,

yes, I've seen that; I've asked Tomasz to push his version and wipe my
changes. Easier than a line-by-line merge of my (syntax-only, easy
replay) and his (actual getting stuff done).

Stefan

Am 30.08.2016 um 13:08 schrieb Janusz Ulanowski:

It looks like|core/Profile.php| was incorrectly merged
PHP Parse error: syntax error, unexpected '<<' (T_SL) in
CAT/core/Profile.php on line 691

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#13, or mute the thread
https://github.com/notifications/unsubscribe-auth/AGDYv-sqOZT6YtvsO7RSYh0W2tFrSnVmks5qlA8xgaJpZM4JwaFD.

Stefan WINTER
Ingenieur de Recherche
Fondation RESTENA - Réseau Téléinformatique de l'Education Nationale et
de la Recherche
2, avenue de l'Université
L-4365 Esch-sur-Alzette

Tel: [phone]
Fax: [phone]

PGP key updated to 4096 Bit RSA - I will encrypt all mails if the
recipient's key is known to me

http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xC0DE6A358A39DC66

[restena-sw]

Hi,

we are now back 24h in the past and Tomasz re-does his edits instead -
they were apparently minimal.

Am 30.08.2016 um 13:08 schrieb Janusz Ulanowski:

It looks like|core/Profile.php| was incorrectly merged
PHP Parse error: syntax error, unexpected '<<' (T_SL) in
CAT/core/Profile.php on line 691

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#13, or mute the thread
https://github.com/notifications/unsubscribe-auth/AGDYv-sqOZT6YtvsO7RSYh0W2tFrSnVmks5qlA8xgaJpZM4JwaFD.

Stefan WINTER
Ingenieur de Recherche
Fondation RESTENA - Réseau Téléinformatique de l'Education Nationale et
de la Recherche
2, avenue de l'Université
L-4365 Esch-sur-Alzette

Tel: [phone]
Fax: [phone]

PGP key updated to 4096 Bit RSA - I will encrypt all mails if the
recipient's key is known to me

http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xC0DE6A358A39DC66

[restena-sw]

And we're back in current time as Tomasz re-did the edits.