Browse files

Solved conflicts between local branch and master (latest changes)

  • Loading branch information...
1 parent 166eab1 commit e7bfd880e0adb40eca8caa11a5b1689e7bd50507 @malderete committed Mar 11, 2013
Showing with 0 additions and 1 deletion.
  1. +0 −1 ninja_ide/core/settings.py
View
1 ninja_ide/core/settings.py
@@ -40,7 +40,6 @@
FONT_FAMILY = 'Monaco'
FONT_SIZE = 11
OS_KEY = QKeySequence(Qt.CTRL).toString(QKeySequence.NativeText)
- EOL_DEFAULT = 'Mac'
elif sys.platform == "win32":
FONT_FAMILY = 'Courier'
FONT_SIZE = 10

0 comments on commit e7bfd88

Please sign in to comment.