CDPP / AMDA_IHM

Commit cfa1d71c34de5281abf8ecbcb82e6cab467e0b8a

Authored by Benjamin Renard
1 parent 16035364
Exists in master and in 111 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, livraison-akka, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Fix an error with the .gitignore file

Showing 2 changed files with 10 additions and 10 deletions   Show diff stats
Inline Side-by-side
.gitignore
  Diff comments   View file @cfa1d71
1   -AMDA_IHM/data/
2   -AMDA_IHM/generic_data/EPNResources/*.xml
3   -AMDA_IHM/generic_data/LocalData/
4   -AMDA_IHM/generic_data/Param/*.xml
5   -AMDA_IHM/generic_data/RemoteData/
6   -AMDA_IHM/generic_data/Statistics/
7   -AMDA_IHM/generic_data/newKernelDDBase/
8   -AMDA_IHM/js/lib/ext
9   -AMDA_IHM/help/simu/simu*
  1 +data/
  2 +generic_data/EPNResources/*.xml
  3 +generic_data/LocalData/
  4 +generic_data/Param/*.xml
  5 +generic_data/RemoteData/
  6 +generic_data/Statistics/
  7 +generic_data/newKernelDDBase/
  8 +js/lib/ext
  9 +help/simu/simu*
... ...
php/my_config.php
  Diff comments   View file @cfa1d71
... ... @@ -7,7 +7,7 @@
7 7 */
8 8  
9 9 //AKKA - Path to AMDA_Integration base dir
10   -define('INTEGRATION_BASE_PATH', '/home/benjamin/AMDA-GIT/AMDA/AMDA_Integration/');
  10 +define('INTEGRATION_BASE_PATH', '/home/benjamin/AMDA-GIT/AMDA_Integration/');
11 11  
12 12 require_once(INTEGRATION_BASE_PATH.'config/AMDAIntegrationConfig.php');
13 13 //
... ...