fix merge

iniakunhuda · Mar 25, 2017 · b948ff7 · b948ff7
2 parents 4cb7153 + 6ea1780
commit b948ff7
Show file tree

Hide file tree

Showing 6 changed files with 732 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,2 @@
-._*
-.~lock.*
-.buildpath
-.DS_Store
+vendor/*
 .idea/*
-.project
-.settings
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# api-cookpad
+# Cookpad API
 Unofficial Cookpad API for developer
 
 <br><blockquote>

diff --git a/composer.json b/composer.json
@@ -0,0 +1,9 @@
+{
+    "autoload": {
+        "psr-4": {"Detikcom\\": "detikcom/pages/*"}
+    },
+
+    "require": {
+        "paquettg/php-html-parser": "^1.7"
+    }
+}
diff --git a/composer.lock b/composer.lock