From f63e5760b36abc674890bf23a4dad50f5edc541a Mon Sep 17 00:00:00 2001
From: speckhard <dts@stanford.edu>
Date: Thu, 31 Jan 2019 12:09:23 +0100
Subject: [PATCH] Fixed typos in setup.py
---
setup.py | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/setup.py b/setup.py
index 15081d5..de3817d 100644
--- a/setup.py
+++ b/setup.py
@@ -19,17 +19,10 @@ def main():
setup(
name='wien2kparser',
version='0.1',
-<<<<<<< HEAD
- description='NOMAD parser implementation for Exciting.',
+ description='NOMAD parser implementation for Wien2k.',
license='APACHE 2.0',
package_dir={'': 'parser/parser-wien2k'},
packages=find_packages('parser/parser-wien2k'),
-=======
- description='NOMAD parser implementation for Wien2k.',
- license='APACHE 2.0',
- package_dir={'': 'parser'},
- packages=find_packages('parser'),
->>>>>>> 45edbd908359cbb40b004309010e2487a8ffbb7c
install_requires=[
'nomadcore'
],
--
GitLab