Fix conflict

691412d9 · Ryan LeFevre · 0e2b1005 · 01ab497b · 691412d9 · 691412d9
Commit 691412d9 authored Apr 15, 2014 by Ryan LeFevre
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

README.md README.md +1 -0

parse.js examples/parse.js +1 -1

No files found.
--- a/README.md
+++ b/README.md
+<<<<<<< HEAD
 # PSD.js

 A general purpose PSD parser written in Coffeescript. Based off of [PSD.rb](https://github.com/layervault/psd.rb).

--- a/examples/parse.js
+++ b/examples/parse.js
 var PSD = require('../');

-psd = PSD.fromFile('/Users/ryanlefevre/LayerVault/Pillocks/Welcome Email.psd');
+psd = PSD.fromFile('./examples/images/example.psd');
 psd.parse();

 console.log(psd.header.export());