-
Notifications
You must be signed in to change notification settings - Fork 0
/
git_conflicts.txt
99 lines (99 loc) · 5.24 KB
/
git_conflicts.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
cvs/objects/build/xcode3/objects.xcodeproj/project.pbxproj
cvs/objects/land_allocator/source/land_node.cpp
cvs/objects/sectors/include/ag_supply_sector.h
cvs/objects/technologies/source/input_factory.cpp
cvs/objects/util/base/include/gcam_data_containers.h
cvs/objects/util/base/include/version.h
input/gcamdata/DESCRIPTION
input/gcamdata/R/constants.R
input/gcamdata/R/module-helpers.R
input/gcamdata/R/sysdata.rda
input/gcamdata/R/zchunk_L112.ghg_en_R_S_T_Y.R
input/gcamdata/R/zchunk_L201.en_nonco2.R
input/gcamdata/R/zchunk_L2012.ag_For_Past_bio_input_irr_mgmt.R
input/gcamdata/R/zchunk_L202.an_input.R
input/gcamdata/R/zchunk_L203.ag_an_demand_input.R
input/gcamdata/R/zchunk_L2052.ag_prodchange_cost_irr_mgmt.R
input/gcamdata/R/zchunk_L2072.ag_water_irr_mgmt.R
input/gcamdata/R/zchunk_L2111.ag_nonco2_IRR.R
input/gcamdata/R/zchunk_L212.unmgd_nonco2.R
input/gcamdata/R/zchunk_L221.en_supply.R
input/gcamdata/R/zchunk_L221.land_input_1.R
input/gcamdata/R/zchunk_L222.en_transformation.R
input/gcamdata/R/zchunk_L222.land_input_2.R
input/gcamdata/R/zchunk_L2231.land_input_3_irr.R
input/gcamdata/R/zchunk_L2242.land_input_4_irr_mgmt.R
input/gcamdata/R/zchunk_L2252.land_input_5_irr_mgmt.R
input/gcamdata/R/zchunk_L2261.regional_biomass_USA.R
input/gcamdata/R/zchunk_L254.transportation_USA.R
input/gcamdata/R/zchunk_LA100.0_LDS_preprocessing.R
input/gcamdata/R/zchunk_LA101.ag_FAO_R_C_Y.R
input/gcamdata/R/zchunk_LA121.liquids.R
input/gcamdata/R/zchunk_LA122.gasproc_refining.R
input/gcamdata/R/zchunk_LA154.transportation_UCD.R
input/gcamdata/R/zchunk_LB1091.ag_GrossTrade.R
input/gcamdata/R/zchunk_batch_ag_an_demand_input_xml.R
input/gcamdata/R/zchunk_batch_all_aglu_emissions_IRR_MGMT_xml.R
input/gcamdata/R/zchunk_batch_all_protected_unmgd_emissions_xml.R
input/gcamdata/R/zchunk_batch_all_unmgd_emissions_xml.R
input/gcamdata/R/zchunk_data_UCD_transportation.R
input/gcamdata/data-raw/generate_package_data.R
input/gcamdata/data/GCAM_DATA_MAP.rda
input/gcamdata/data/PREBUILT_DATA.rda
input/gcamdata/inst/extdata/aglu/A_LT_Mapping.csv
input/gcamdata/inst/extdata/aglu/A_LandLeaf3.csv
input/gcamdata/inst/extdata/aglu/A_LandNode_logit_irr.csv
input/gcamdata/inst/extdata/aglu/A_agRegionalSector.csv
input/gcamdata/inst/extdata/aglu/A_agRegionalSubsector.csv
input/gcamdata/inst/extdata/aglu/A_agRegionalTechnology.csv
input/gcamdata/inst/extdata/aglu/A_agSupplySector.csv
input/gcamdata/inst/extdata/aglu/A_agSupplySubsector.csv
input/gcamdata/inst/extdata/aglu/A_agTradedSector.csv
input/gcamdata/inst/extdata/aglu/A_agTradedSubsector.csv
input/gcamdata/inst/extdata/aglu/A_agTradedTechnology.csv
input/gcamdata/inst/extdata/aglu/A_an_input_subsector.csv
input/gcamdata/inst/extdata/aglu/A_an_input_technology.csv
input/gcamdata/inst/extdata/aglu/A_defaultYieldRate.csv
input/gcamdata/inst/extdata/aglu/A_demand_subsector.csv
input/gcamdata/inst/extdata/aglu/A_demand_technology.csv
input/gcamdata/inst/extdata/aglu/FAO/FAO_ag_items_PRODSTAT.csv
input/gcamdata/inst/extdata/aglu/FAO/FAO_ag_items_TRADE.csv
input/gcamdata/inst/extdata/aglu/FAO/FAO_ag_items_cal_SUA.csv
input/gcamdata/inst/extdata/aglu/GCAMLandLeaf_CdensityLT.csv
input/gcamdata/inst/extdata/aglu/IIASA_biofuel_tech_mapping.csv
input/gcamdata/inst/extdata/emissions/A11.max_reduction.csv
input/gcamdata/inst/extdata/emissions/A11.steepness.csv
input/gcamdata/inst/extdata/emissions/A41.tech_coeff.csv
input/gcamdata/inst/extdata/emissions/mappings/GCAM_sector_tech.csv
input/gcamdata/inst/extdata/emissions/mappings/GCAM_sector_tech_Revised.csv
input/gcamdata/inst/extdata/energy/A21.globaltech_coef.csv
input/gcamdata/inst/extdata/energy/A21.globaltech_cost.csv
input/gcamdata/inst/extdata/energy/A21.globaltech_interp.csv
input/gcamdata/inst/extdata/energy/A21.globaltech_secout.csv
input/gcamdata/inst/extdata/energy/A21.globaltech_shrwt.csv
input/gcamdata/inst/extdata/energy/A22.globaltech_coef.csv
input/gcamdata/inst/extdata/energy/A22.globaltech_cost.csv
input/gcamdata/inst/extdata/energy/A22.globaltech_cost_low.csv
input/gcamdata/inst/extdata/energy/A22.globaltech_keyword.csv
input/gcamdata/inst/extdata/energy/A22.globaltech_retirement.csv
input/gcamdata/inst/extdata/energy/A22.globaltech_shrwt.csv
input/gcamdata/inst/extdata/energy/A22.subsector_interp.csv
input/gcamdata/inst/extdata/energy/A54.globaltranTech_interp.csv
input/gcamdata/inst/extdata/energy/A54.globaltranTech_interp_revised.csv
input/gcamdata/inst/extdata/energy/A54.globaltranTech_retire.csv
input/gcamdata/inst/extdata/energy/A54.globaltranTech_retire_revised.csv
input/gcamdata/inst/extdata/energy/A54.globaltranTech_shrwt.csv
input/gcamdata/inst/extdata/energy/A54.globaltranTech_shrwt_revised.csv
input/gcamdata/inst/extdata/energy/A_regions.csv
input/gcamdata/inst/extdata/energy/OTAQ_trn_data_EMF37.csv
input/gcamdata/inst/extdata/energy/UCD_trn_data_CORE.csv
input/gcamdata/inst/extdata/energy/UCD_trn_data_SSP1.csv
input/gcamdata/inst/extdata/energy/UCD_trn_data_SSP2.csv
input/gcamdata/inst/extdata/energy/UCD_trn_data_SSP3.csv
input/gcamdata/inst/extdata/energy/UCD_trn_data_SSP5.csv
input/gcamdata/inst/extdata/energy/mappings/IEA_flow_sector.csv
input/gcamdata/inst/extdata/energy/mappings/UCD_techs.csv
input/gcamdata/inst/extdata/energy/mappings/UCD_techs_revised.csv
input/gcamdata/man/PREBUILT_DATA.Rd
input/gcamdata/man/module_data_UCD_transportation.Rd
input/gcamdata/man/prebuilt_data.Rd