General info merge changes
This commit is contained in:
parent
64beed58d5
commit
8661ea00f8
@ -1 +1 @@
|
|||||||
{"version":3,"sources":["../../@angular/common/http (ignored)"],"names":[],"mappings":";;;;;AAAA,e","file":"0.js","sourcesContent":["/* (ignored) */\n\n\n//////////////////\n// WEBPACK FOOTER\n// @angular/common/http (ignored)\n// module id = 721\n// module chunks = 0"],"sourceRoot":""}
|
{"version":3,"sources":[],"names":[],"mappings":"","sourcesContent":[]}
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -87,14 +87,11 @@ export class PdQuestionGeneralInfoPage {
|
|||||||
imageBucket: any=[];
|
imageBucket: any=[];
|
||||||
tab: any='0';
|
tab: any='0';
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
pd_value_params:any;
|
pd_value_params:any;
|
||||||
@ViewChild('childComp') child: PdGeneralImagesPage
|
@ViewChild('childComp') child: PdGeneralImagesPage
|
||||||
@ViewChild('individualPersonScroll') individualPersonScroll:ElementRef
|
@ViewChild('individualPersonScroll') individualPersonScroll:ElementRef
|
||||||
@ViewChild('companyScroll') companyScroll:ElementRef
|
@ViewChild('companyScroll') companyScroll:ElementRef
|
||||||
=======
|
|
||||||
public KYC: any = [{value:"yes",isdisplayvalue:"Yes"},{value:"no",isdisplayvalue:"No"}];
|
public KYC: any = [{value:"yes",isdisplayvalue:"Yes"},{value:"no",isdisplayvalue:"No"}];
|
||||||
>>>>>>> c7fef7d1b46ea9a66ff81084eb86ae62ad411496
|
|
||||||
|
|
||||||
constructor(public navCtrl: NavController, public navParams: NavParams,
|
constructor(public navCtrl: NavController, public navParams: NavParams,
|
||||||
public aws:AwsServiceProvider,public qustCat:QuestionCategoryProvider,
|
public aws:AwsServiceProvider,public qustCat:QuestionCategoryProvider,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user