added

corserp · May 15, 2018 · ba7a961 · ba7a961
2 parents 666522f + ca5e131
commit ba7a961
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/config b/config
@@ -6,7 +6,7 @@
 	symlinks = false
 	ignorecase = true
 [remote "origin"]
-	url = http://master'alias'@currentlyamee.ssh
+	url = http://github.com/corserp/corser.git
 	fetch = +refs/heads/*:refs/remotes/origin/*
 [branch "master"]
 	remote = origin

diff --git a/molecule/core.py b/molecule/core.py
@@ -41,10 +41,14 @@
 
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ac8bbd23cccd6487b2a9b73ced5182ae22376c7d
 =======
 >>>>>>> initial commit
 >>>>>>> initialized
+=======
+>>>>>>> ac8bbd23cccd6487b2a9b73ced5182ae22376c7d
+>>>>>>> master
 
 class Molecule(object):
     # locations to look for a config file
@@ -238,11 +242,15 @@ def _trailing_whitespace(self, filename):
                     print l
                     sys.exit(1)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 >>>>>>> ac8bbd23cccd6487b2a9b73ced5182ae22376c7d
 =======
 >>>>>>> initial commit
 >>>>>>> initialized
+=======
+>>>>>>> ac8bbd23cccd6487b2a9b73ced5182ae22376c7d
+>>>>>>> master
     def _rubocop(self):
         try:
             pattern = self._config['serverspec_dir'] + '/**/*.rb'
@@ -393,10 +401,14 @@ def _verify(self):
 =======
         self._trailing_validators()
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ac8bbd23cccd6487b2a9b73ced5182ae22376c7d
 =======
 >>>>>>> initial commit
 >>>>>>> initialized
+=======
+>>>>>>> ac8bbd23cccd6487b2a9b73ced5182ae22376c7d
+>>>>>>> master
 
         # no tests found
         if not os.path.isdir(self._config['serverspec_dir']) and not os.path.isdir(self._config['testinfra_dir']):