diff options
| author | Dominik Picheta <dominikpicheta@gmail.com> | 2016-03-23 14:30:25 +0000 |
|---|---|---|
| committer | Dominik Picheta <dominikpicheta@gmail.com> | 2016-03-23 14:30:25 +0000 |
| commit | 146fdf14fead417b1d4d9e2938c9443a1c32ec03 (patch) | |
| tree | 24e72134c66360f8f4d26ba3faa7ad2570e8c447 | |
| parent | 01f9a80360749f59ead4a5457d004087f654e08e (diff) | |
| download | packages-146fdf14fead417b1d4d9e2938c9443a1c32ec03.tar.gz packages-146fdf14fead417b1d4d9e2938c9443a1c32ec03.zip | |
Fix merge conflict artifacts.
| -rw-r--r-- | packages.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/packages.json b/packages.json index 4091ccf..fd6d304 100644 --- a/packages.json +++ b/packages.json @@ -4360,7 +4360,6 @@ "web": "https://github.com/baabelfish/mangle" }, { -<<<<<<< HEAD "name": "nimshell", "url": "https://github.com/vegansk/nimshell", "method": "git", |