wait #5652 @0.75

Merge remote-tracking branch 'remotes/origin/before-dsn'

# Conflicts:
#	PAIE/CUBE.$SO/DSN/DSN20221210_CNS_07.DSN
#	PAIE/CUBE.$SO/NUMEROS.$D1
#	PAIE/CUBE.$SO/NUMEROS.B00
#	PAIE/CUBE.$SO/PA_ASSEDIC.$D1
#	PAIE/CUBE.$SO/PA_DS_E_R.$D1
#	PAIE/CUBE.$SO/PA_DS_E_R.B01
#	PAIE/CUBE.$SO/PA_DS_E_R.B0a
#	PAIE/CUBE.$SO/PA_DS_E_R.H00
#	PAIE/CUBE.$SO/PA_DS_E_S.$D1
#	PAIE/CUBE.$SO/PA_DS_E_S.B01
#	PAIE/CUBE.$SO/PA_DS_E_S.B02
#	PAIE/CUBE.$SO/PA_DS_E_S.B05
#	PAIE/CUBE.$SO/PA_DS_E_S.B06
#	PAIE/CUBE.$SO/PA_DS_E_S.B18
#	PAIE/CUBE.$SO/PA_DS_E_S.H00
#	systeme/$$-PREF.$D1
#	systeme/CONNEXION.$D1
#	systeme/COURS.$D1
#	systeme/COURS.B01
#	systeme/COURS.B02
#	systeme/COURS.B06
#	systeme/NUMCOURS.$D1
#	systeme/SYSNUMS.$D1
#	systeme/licences/suscribe.data

diff --cc PAIE/CUBE.$SO/BulletinsPDF/202212/CNS 202212.pdf
index 460c397b8e563a15f9a4709b198294dc11a4a875,460c397b8e563a15f9a4709b198294dc11a4a875..65c4686c7d2fbc718e8baee6bae8684666db7c8a
Binary files differ

diff --cc PAIE/CUBE.$SO/BulletinsPDF/202212/DEY 202212.pdf
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..347fd61d8eee3f91d13bf3af8e0cd7e5b4a29ec5
new file mode 100644 (file)
Binary files differ

diff --cc PAIE/CUBE.$SO/BulletinsPDF/202212/ETL 202212.pdf
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..85094d105e17d6c6efc5e37db04476d89fdbfd76
new file mode 100644 (file)
Binary files differ

diff --cc PAIE/CUBE.$SO/BulletinsPDF/202212/STM 202212.pdf
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b8f52acf6ce00da30980765999a471d330c14f7d
new file mode 100644 (file)
Binary files differ

diff --cc PAIE/CUBE.$SO/BulletinsPDF/202212/VLV 202212.pdf
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..7318cf295e59ca403912174bc834238f4f884fe8
new file mode 100644 (file)
Binary files differ

diff --cc PAIE/CUBE.$SO/DSN/DSN20221210_CNS_07.DSN
index f0fc0c076d3d428e2b84ecb038eac4bfa7482f65,05091b06a7c1fcb20d99410cb103f50a8ce62922..c4bd777b6b5dd2d386d40b98c52a2991c6c82c8a
--- 1/PAIE/CUBE.$SO/DSN/DSN20221210_CNS_07.DSN
--- 2/PAIE/CUBE.$SO/DSN/DSN20221210_CNS_07.DSN
+++ b/PAIE/CUBE.$SO/DSN/DSN20221210_CNS_07.DSN
@@@ -17,7 -17,7 +17,11 @@@ S10.G00.02.005,'0144241853
  S20.G00.05.001,'07'
  S20.G00.05.002,'01'
  S20.G00.05.003,'11'
++<<<<<<< HEAD
 +S20.G00.05.004,'20221206094458'
++=======
+ S20.G00.05.004,'20221206095906'
++>>>>>>> remotes/origin/before-dsn
  S20.G00.05.007,'06122022'
  S20.G00.05.009,'00000003'
  S20.G00.05.010,'01'

diff --cc PAIE/CUBE.$SO/NUMEROS.$D1
index 92fa3dc7f7673299f5b93ac3d80201e6b795c57c,71f34a4402ca67a7814d671aeb847b306e7c8bd5..0ac361bb2801a5acb01dcb1e642ad17d737fe921
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_ABSEN.$D1
index 2c36bbbf567f98150dce90a5a2398b79e16cf747,2c36bbbf567f98150dce90a5a2398b79e16cf747..6bd9826362b3875ab62cc60319a9fd859e06e035
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_ABSEN.B01
index f065048d76c7ef164b7f3986b5d5ed9346e73ca2,f065048d76c7ef164b7f3986b5d5ed9346e73ca2..1f3b8dcaad249fe2d141d6cd2c6f469ac03012c8
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_ABSEN.B0d
index d492cc102bb670777a414496211057d4b330cc64,d492cc102bb670777a414496211057d4b330cc64..284d9b1c74e77fdb46627e12cd76a608a88972a0
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_ABSEN.B0e
index 501079353865785e54adfdb4f6a76acea0bf385c,501079353865785e54adfdb4f6a76acea0bf385c..1e30824771b81330f5939a7f51e660f288eb5b54
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_ABSEN.H00
index 13fe28dd69b77d5f76dc785b99e9940ce236e595,13fe28dd69b77d5f76dc785b99e9940ce236e595..d7c53535ca5b8a9481bd11f07e0c77ed11673ac5
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BULLE.$D1
index eabc810fa2ddea2f8003527b4abfc9ccff76e8d4,eabc810fa2ddea2f8003527b4abfc9ccff76e8d4..79225d607caf84c3b3a03c6050796562b61d425d
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BULLE.B01
index 253bbb6181a2409a87b824096f2055d1e9bb388e,253bbb6181a2409a87b824096f2055d1e9bb388e..4087a644a2ca25fb0ff71baf1d537e5a8f457035
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BULLE.B27
index c611b4bcb28af5de3c260aece006f09809834cef,c611b4bcb28af5de3c260aece006f09809834cef..c60be13f4968624ddcd9e159c56b92740a11641e
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BULLE.B28
index 2cd4d7c4ba4fba654ead48095d651f5a68e70b7b,2cd4d7c4ba4fba654ead48095d651f5a68e70b7b..4c3b4603769a55955dbdd528ae798574fcfd2d11
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BULLE.B29
index 0c0c3ecbb04031fe09bb7ed5002f91a98c2e02a1,0c0c3ecbb04031fe09bb7ed5002f91a98c2e02a1..fd59493fea5237b6fc3af05626e1613baa9cf289
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BULLE.B2a
index 2ae8ff93b71bd5a775cee50108aeaf1c2bd7db2e,2ae8ff93b71bd5a775cee50108aeaf1c2bd7db2e..03a814c7f8fecd0371346d05cdb3f9be9f5c6cae
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BULLE.B2b
index 7a02601c3dfedc916c13c23f7475e0a4449bde79,7a02601c3dfedc916c13c23f7475e0a4449bde79..fe40151597bd66dc5a1cbb006acd776e1b327c00
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BULLE.B2c
index c991f981cfab7baf1cf26db36cc5b1ad91656846,c991f981cfab7baf1cf26db36cc5b1ad91656846..9acdbdacbddd2c3f146df06f5ced6dee293cee65
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BULLE.B2d
index b2f4c7d323a7ba5973e31eaeef343c06d0defcd4,b2f4c7d323a7ba5973e31eaeef343c06d0defcd4..b4bfa1f080d02f96889cc3cbf37eb01d93114fa8
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BULLE.H00
index 272e3cb1584f1daff88515168f1ea3cf41cf1da3,272e3cb1584f1daff88515168f1ea3cf41cf1da3..7f395919db85b6d684aa5b02a67b392a6bbda348
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BUL_R.$D1
index 152b60cbd79447821d10cfe619932141b63264bf,152b60cbd79447821d10cfe619932141b63264bf..e65251d48655c4f3432e3d7a0b475c6e51508f68
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BUL_R.B00
index 23680b6919a8f9669c899a23745bce6ae84c24e6,23680b6919a8f9669c899a23745bce6ae84c24e6..100e75945105fb57e283187eb46500e12e286c69
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BUL_R.B0d
index af175f6bc5d69ff25ad2d78fdd1c61c773defb62,af175f6bc5d69ff25ad2d78fdd1c61c773defb62..1f45b1517bcb28494e825aaf6fa043be7ea5b295
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BUL_R.B0e
index b45cedf8d6c7bce743d717097f4aa65b54d6bbc9,b45cedf8d6c7bce743d717097f4aa65b54d6bbc9..71d6690f7689ef09ef668e98e644e3d47651ebd5
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BUL_R.B0f
index ab682753d7a80df933663083948412d7760c17b0,ab682753d7a80df933663083948412d7760c17b0..053f1f2f357b042acd8559cc7647d324f844622e
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BUL_R.B10
index b0f253e34a9a263c51c08b9355a6119c85a3d1f5,b0f253e34a9a263c51c08b9355a6119c85a3d1f5..530150a7b7e95d3c9a061f7b088d3740232e9d11
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BUL_R.B11
index c8fafda8134635d5dd9a469c355c4ad3f6e6d1bc,c8fafda8134635d5dd9a469c355c4ad3f6e6d1bc..b28de78deb4f28f30a80c0195f1164ea73ebb0bb
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_BUL_R.B12
index c648fae206fbf3875f657b3a7660d03690d8ad6a,c648fae206fbf3875f657b3a7660d03690d8ad6a..727a4302207bf1de85b76cab7429f2777ca355d6
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_EPERE.$D1
index bff5f81ce586191c63b0fe93eabab6160043f532,bff5f81ce586191c63b0fe93eabab6160043f532..42b64a8c34851651119bce913c7a9dfd019e2c0c
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_EPERE.B01
index b413f948778735884964c59b9a14f415114a8781,b413f948778735884964c59b9a14f415114a8781..ae2b7e6b5df0fe92b655d0102122ce0c8c249b54
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_EPERE.B06
index db200f17e8e5745547c94094c7fbb20b5c7967c2,db200f17e8e5745547c94094c7fbb20b5c7967c2..f3cc2390e0a93bc5a71fc5da1c0d23c406fc1fa4
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_EPERE.H00
index 7da4dcaeba5eb7b7ef34eb8346a342f31069e14f,7da4dcaeba5eb7b7ef34eb8346a342f31069e14f..db9065eaf9d3b06ee335bba15d5389ee8da25663
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_EPERE.H02
index a241dc2e61f45abcf822ed6ef8999e96f6248ddc,a241dc2e61f45abcf822ed6ef8999e96f6248ddc..c7dbf249d18c5821a3e581d3d4af5060d3247630
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_EVAR_E.$D1
index 723980be63c8b00136c0a5ca5f8026b09e4051f8,723980be63c8b00136c0a5ca5f8026b09e4051f8..c01aa49efda19616eecaaf2aa51ad28b9405763e
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_EVAR_L.$D1
index ba0c3adb0dcfe40abb7a27775e3a62f752e3ad8b,ba0c3adb0dcfe40abb7a27775e3a62f752e3ad8b..1b032a68cb3c93eacce20a67da6a880eea981278
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_EVAR_L.B00
index 46411f9dfe66f8bb2fb8a0f778c2b2e17cf880b6,46411f9dfe66f8bb2fb8a0f778c2b2e17cf880b6..8422c8c7d5e30ba69dbf69a65b98bb2bd14f5a21
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_EVAR_L.B04
index 8c382ddd40d97a7d57354b2c25332188d1754c23,8c382ddd40d97a7d57354b2c25332188d1754c23..edbce603c7891867d20cd14a670a84323f3c08bc
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_SALARH.$D1
index d8df7a67276adccd8c91273dd09689484e3a540d,d8df7a67276adccd8c91273dd09689484e3a540d..6a084e03a20ad5990e188cd374735d38fd732132
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_SALARH.B00
index af038bb218dbf95ca54edfc49904ce8160c38d44,af038bb218dbf95ca54edfc49904ce8160c38d44..19036ee2f9be746d0b3647f530cafc477cbc39bf
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_SALARH.B01
index fd590fd0cad545feef54eb32e10aeb4c59b56edf,fd590fd0cad545feef54eb32e10aeb4c59b56edf..efb0ccccd7da92b6b9243a65c096f1f50c171706
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_SALARH.B03
index 6229ede1996853b36d06ce2efed073b7ecb5ae4d,6229ede1996853b36d06ce2efed073b7ecb5ae4d..689580871d417b673a3a56ff758af4ed25ef5af5
Binary files differ

diff --cc PAIE/CUBE.$SO/PA_SALARH.B04
index 291f4debe7b6567c19a66670397e29983ce26e96,291f4debe7b6567c19a66670397e29983ce26e96..c3bc3c59eb9721f593ed00f7a98da0f40832c161
Binary files differ

diff --cc PAIE/CUBE.$SO/TRACE_EVENT.$D1
index e074fd6202e077e6a3d9e7cab2c0b40faa7fb5d5,e074fd6202e077e6a3d9e7cab2c0b40faa7fb5d5..afd944be51ea8557a66468c2af8c0e79195606fa
Binary files differ

diff --cc PAIE/CUBE.$SO/TRACE_EVENT.B01
index 6f005469caeda57c00f427b334b12d2925ca2561,6f005469caeda57c00f427b334b12d2925ca2561..84b517e6877d32eee4b4cf25fc840da06de5db7a
Binary files differ

diff --cc PAIE/CUBE.$SO/TRACE_EVENT.H00
index 10d4fa3738815be45c119bb8fb3fc9adc227cabc,10d4fa3738815be45c119bb8fb3fc9adc227cabc..a3984cd762b49e7e6e0efb3eeaa2f4e92ee41452
Binary files differ

diff --cc systeme/$$-PREF.$D1
index 6dd81cc16d0ba1f19c756dfc43ef5d3f1d897af0,d6a83b005c57c47e5af5dc988361ba409317d958..ddd3a62aacf1c4392aac83801b594ec65eb1d257
Binary files differ

diff --cc systeme/CONNEXION.$D1
index 0d042ed854af0f758c1bf4eca192b524d15449dc,481eeecd530fe12cda66cb67442615692a8792d1..71e2d9009fc5bff495a8374c8705215c2df5c0e5
Binary files differ

diff --cc systeme/COURS.$D1
index 5cc6280c3dc1413653604d12f3da0eeb896473bf,53c956307b167e3ff7d66ca7556012f290a19dac..c241e2aa923d4f95c5cd9a60842bcfe84104aa32
Binary files differ

diff --cc systeme/COURS.B01
index 09d3b37c2abb4a373f3c1a3e17ee7cf7ab360195,283cf35d4b77ca9f356350bfd27777cb69fe5672..8b0c09d6211dfb65f0d9cb1240fd9294ba24143c
Binary files differ

diff --cc systeme/COURS.B02
index 504b230b42857003c18cf26e1833dbdafc2cf504,6f90ae5c48a9830f173771acb9e28c137d96dc89..ba595b8fecec3aba26570c4eee41c278538487bb
Binary files differ

diff --cc systeme/COURS.B06
index 610c0fb3359f62db3705c63316764fee0225a2fa,8a801a0d846f55a4094415bb3de406ab4e1400dd..afdf334425521161977cab0d38e58e890df52581
Binary files differ

diff --cc systeme/SYSNUMS.$D1
index 792b7063c1e938954f9d937f5e906c8f7a78ce40,81dacf5aaad48ccc042384b9fcc545d46f590d31..7af9452c4591236faed9b91d6a64d94c2f64f69e
Binary files differ

diff --cc systeme/licences/suscribe.data
index 6ad571441946e7dab04097955b3172e40a1a5560,dff021d14169d08f8c9a5283051f47ce5170f042..819b4abd311e56145972142c135b3bfcdea64fe1
--- 1/systeme/licences/suscribe.data
--- 2/systeme/licences/suscribe.data
+++ b/systeme/licences/suscribe.data
@@@ -1,5 -1,5 +1,10 @@@
  [status]
- 93130=7D815F160436713C3FCCAA45206BB7CA594905EFEFD3F7AB49C002E11C8C783CF38CDE0ACB966324
- 130=315A4E6E18FDA98C4F6EB65560CDA22A77B22544881DA0F6C7F17330CB9DA8177D2E836AAC74739A
++<<<<<<< HEAD
++93130=7D815F160436713C0FC43C33E823A67E977DC3E5E78A5F1335B3F97F01546B96F38CDE0ACB966324
++130=315A4E6E18FDA98C4F6EB65560CDA22A9EDEA5A119871226C7F17330CB9DA817F38CDE0ACB966324
++=======
+ 93130=7D815F160436713C0FC43C33E823A67E977DC3E5E78A5F1335B3F97F01546B9678D40DF6A7AACB6B
+ 130=315A4E6E18FDA98C4F6EB65560CDA22A9EDEA5A119871226C7F17330CB9DA81778D40DF6A7AACB6B
++>>>>>>> remotes/origin/before-dsn
  [settings]
  dbdata=77C6866E472057B0A1F73018FE8956CE