Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: DarkOne/Hotels
base: 6441f3a4f3
...
head fork: DarkOne/Hotels
compare: e3cceaef29
Checking mergeability… Don't worry, you can still create the pull request.
  • 5 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on Apr 27, 2012
false hello 3a94d94
false Merge branch 'master' of github.com:DarkOne/Hotels fd0a9f1
false 1 20fadc9
Commits on May 08, 2012
false 11 8202539
false Merge branch 'master' of github.com:DarkOne/Hotels
Conflicts:
	mysite/hotels/models.py
	mysite/settings.py
e3cceae
View
35 mysite/.gitignore
@@ -0,0 +1,35 @@
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+*.pyc
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
View
BIN  mysite/hotels/__init__.pyc
Binary file not shown
View
6 mysite/settings.py
@@ -12,9 +12,9 @@
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
- 'NAME': 'djtest', # Or path to database file if using sqlite3.
- 'USER': 'darkone', # Not used with sqlite3.
- 'PASSWORD': '1310lin', # Not used with sqlite3.
+ 'NAME': 'djhd', # Or path to database file if using sqlite3.
+ 'USER': 'false', # Not used with sqlite3.
+ 'PASSWORD': '', # Not used with sqlite3.
'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
'PORT': '', # Set to empty string for default. Not used with sqlite3.
}

No commit comments for this range

Something went wrong with that request. Please try again.