- del some code
- del a line
Merge branch 'dev'