From b973f0844064eedd24bb37ae39d2e8aa7b41868c Mon Sep 17 00:00:00 2001
From: Nick Eubank <nickeubank@gmail.com>
Date: Sun, 22 May 2016 10:03:28 -0700
Subject: [PATCH] fix merge conflicts

---
 README.md    | 20 --------------------
 package.json | 17 -----------------
 2 files changed, 37 deletions(-)

diff --git a/README.md b/README.md
index 857f8d7..432154f 100644
--- a/README.md
+++ b/README.md
@@ -1,28 +1,16 @@
-<<<<<<< HEAD
-# language-do package
-=======
 # language-do package for Atom
->>>>>>> 2ada208bddb9937cf4eb91673137537c6802e2f3
 
 This package adds **language support and syntax highlighting for [Stata](http://stata.com/) .do files** in the Open-Source, next generation [**Atom Text Editor**](https://github.com/atom/atom).
 
 ![](http://i.imgur.com/Nnnp4Pr.png)
 
 
-<<<<<<< HEAD
-## How to install it in Atom (once the package is approved):
-=======
 ## How to install it in Atom:
->>>>>>> 2ada208bddb9937cf4eb91673137537c6802e2f3
 Open a terminal and paste:
 
 `apm install language-do`
 
-<<<<<<< HEAD
 will install the package in your Atom. Which is the proper way to install it and you will receive the updates automatically.
-=======
-will install the package in your Atom. Which is the proper way to install it and you will receive the updates automatically. 
->>>>>>> 2ada208bddb9937cf4eb91673137537c6802e2f3
 
 
 
@@ -32,11 +20,7 @@ You have to download or clone this repository, extract the content and copy the
 <br>
 
 #### (Ninja-Install only for Gnu/Linux*):
-<<<<<<< HEAD
 Open a terminal and paste this line to install the language in one command:
-=======
-Open a terminal and paste this line to install the language in one command: 
->>>>>>> 2ada208bddb9937cf4eb91673137537c6802e2f3
 
 
 `
@@ -54,11 +38,7 @@ cd ~/.atom && wget https://github.com/rhoconlinux/language-do/archive/master.zip
 
 - do.cson: added proper comment of "*" (fixed multiplication symbol)
 - do.cson: added foreach, by and mata differentiation
-<<<<<<< HEAD
 - language.do: fixed warning after 'completions':[
-=======
-- language.do: fixed warning after 'completions':[ 
->>>>>>> 2ada208bddb9937cf4eb91673137537c6802e2f3
 
 
 ###### About the author:
diff --git a/package.json b/package.json
index 3b79dc0..e843c67 100644
--- a/package.json
+++ b/package.json
@@ -1,31 +1,15 @@
 {
   "name": "language-do",
-<<<<<<< HEAD
-  "main": "./lib/language-do",
-  "version": "0.2.0",
-  "description": "Atom syntax package for Stata do files",
-  "activationEvents": ["language-do:toggle"],
-  "repository": "https://github.com/atom/language-do",
-=======
   "version": "0.1.0",
   "description": "Atom package for Stata do files",
   "repository": {
     "type": "git",
     "url": "https://github.com/rhoconlinux/do-language"
   },
->>>>>>> 2ada208bddb9937cf4eb91673137537c6802e2f3
   "license": "MIT",
   "engines": {
     "atom": ">0.50.0"
   },
-<<<<<<< HEAD
-  "dependencies": {
-  }
-}
-"bugs": {
-    "url": "https://github.com/rhoconlinux/do-language/issues"
-  },
-=======
   "dependencies": {},
   "readme": "# language-do package\n\nLanguage support for do for the Atom Editor.\nPackage converted from TextMate bundle.\n",
   "readmeFilename": "README.md",
@@ -40,4 +24,3 @@
   "_resolved": "/tmp/d-114412-27355-i5a8bg/package.tgz",
   "_from": "/tmp/d-114412-27355-i5a8bg/package.tgz"
 }
->>>>>>> 2ada208bddb9937cf4eb91673137537c6802e2f3