ummahusla

# overwrite master with contents of feature branch (feature > master)
git checkout feature      # source name
git merge -s ours master  # target name
git checkout master       # target name
git merge feature         # source name

mottosso

QML Console Test

mavc

import re

from ply import lex, yacc
from ply.lex import TOKEN
import pyparsing as pp

# First, let's define a pyparsing parser for JSON.
class JSONPyParsing(object):
    # pylint: disable-msg=W0104,E0213