Skip to content

Commit

Permalink
Merge branch 'master' of github.com:getnikola/nikola
Browse files Browse the repository at this point in the history
  • Loading branch information
ralsina committed Oct 4, 2013
2 parents cd0800c + dd83679 commit 172a4ce
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def copy_messages():


def copy_symlinked_for_windows():
"""replaces the hardlinked files with a copy of the original content.
"""replaces the symlinked files with a copy of the original content.
In windows (msysgit), a symlink is converted to a text file with a
path to the file it points to. If not corrected, installing from a git
Expand Down Expand Up @@ -266,7 +266,6 @@ def find_package_data(
'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Topic :: Internet',
'Topic :: Internet :: WWW/HTTP',
Expand Down

0 comments on commit 172a4ce

Please sign in to comment.