linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-26 02:12:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

other various changes

Browse source
This commit is contained in:
Mike Hostetler 2011-03-16 15:02:36 -05:00
commit 0d09d9a10a
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/django.zsh
View file

@ -1,15 +1,10 @@
<<<<<<< HEAD
=======
alias pm='python manage.py'
>>>>>>> upstream/master
alias pmr='python manage.py runserver'
alias pmrp='python manage.py runserver_plus'
alias pmrpg='pmrp --adminmedia=`pwd`/media/admin'
alias pmsdb='python manage.py syncdb'
alias pms='python manage.py shell'
<<<<<<< HEAD
alias pmlf='python manage.py loaddata fixtures/*'
=======
alias pmsp='python manage.py shell_plus'
alias pmlf='python manage.py loaddata fixtures/*'
alias pmt='python -W ignore::DeprecationWarning manage.py test'
@ -34,4 +29,3 @@ function djapp() {
echo "from django.contrib import admin\nfrom $1.models import *\n\n" > $1/admin.py
echo "from django.conf.urls.defaults import *\n\n" > $1/urls.py
}
>>>>>>> upstream/master