Sineedge/pd_officer
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes : ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-03-28 20:05:07 +05:30
parent 535304d35d
commit 91e43a7e6c
3 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.sourcemaps/main.js.map
View File

File diff suppressed because one or more lines are too long

11
package-lock.json generated
View File

@ -215,8 +215,6 @@
"@types/localforage": "0.0.30", "@types/localforage": "0.0.30",
"localforage": "~1.4.2", "localforage": "~1.4.2",
"localforage-cordovasqlitedriver": "~1.5.0" "localforage-cordovasqlitedriver": "~1.5.0"
<<<<<<< HEAD
=======
} }
}, },
"@netbasal/content-loader": { "@netbasal/content-loader": {
@ -232,7 +230,6 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
} }
>>>>>>> 7d6b9204d0b22d85f2a9af7c6ff15479f39e0fe6
} }
}, },
"@types/chart.js": { "@types/chart.js": {
@ -2735,13 +2732,11 @@
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -2758,8 +2753,7 @@
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
@ -2888,7 +2882,6 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }

3
www/build/main.css
View File

@ -29893,7 +29893,6 @@ page-pd-question-rental-info .mat-card-content {
page-pd-question-rental-info .scroll-content { page-pd-question-rental-info .scroll-content {
background-color: #eee; background-color: #eee;
<<<<<<< HEAD
} }
page-pd-question-rental-info .mat-form-field-label { page-pd-question-rental-info .mat-form-field-label {
@ -29906,6 +29905,4 @@ page-pd-question-rental-info mat-select {
page-pd-question-rental-info input { page-pd-question-rental-info input {
height: 30px; height: 30px;
=======
>>>>>>> 7d6b9204d0b22d85f2a9af7c6ff15479f39e0fe6
} }