Skip to content

Commit 5f0a0a4

Browse files
kshitijverma22kshitijverma22
committed
resolve conflict
2 parents a20bda5 + 32ac7cf commit 5f0a0a4

File tree

9 files changed

+223
-468
lines changed

9 files changed

+223
-468
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
vendor
22
test.php
3-
test/coveraget
3+
test/coveraget
4+
.idea

‎.idea/php.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/shopify-api-php-sdk.iml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.travis.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
language: php
22
dist: trusty
33
php:
4-
- 7.0
5-
- 7.1
64
- 7.2
75
- 7.3
86
- 7.4

‎composer.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
],
1414
"require": {
1515
"php": ">=7.0",
16-
"rdx/graphql-query" : "^1.1",
17-
"guzzlehttp/guzzle": "^6.3",
16+
"rdx/graphql-query" : "^1.1"
17+
},
18+
"require-dev":{
19+
"guzzlehttp/guzzle": "^6.3.1|^7.0.1",
1820
"phpunit/phpunit": "^6.5"
1921
},
2022
"autoload": {

0 commit comments

Comments
 (0)