projects / oweals / finalsclub.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 92d94c3)
Merge branch 'master' of https://github.com/sethwoodworth/FinalsClub 16/head
authorSeth Woodworth <seth@sethish.com>
Wed, 7 Dec 2011 04:20:13 +0000 (04:20 +0000)
committerSeth Woodworth <seth@sethish.com>
Wed, 7 Dec 2011 04:20:13 +0000 (04:20 +0000)
Conflicts:
public/index.html

.gitignore patch | blob | history
fc-new-design/.DS_Store [deleted file] patch | blob | history
public/index.html patch | blob | history

diff --git a/.gitignore b/.gitignore
index 3c3629e647f5ddf82548912e337bea9826b434af..847479df76f5cf4a9b744fff536ef4f802cc9e32 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,21 @@
+# Globally ignore
+*.DS_Store
+*.swp
+*.swo
+
+# Imported from https://github.com/github/gitignore/blob/master/Node.gitignore
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+pids
+logs
+results
+
 node_modules
+npm-debug.log
diff --git a/fc-new-design/.DS_Store b/fc-new-design/.DS_Store
deleted file mode 100644 (file)
index c328838..0000000
Binary files a/fc-new-design/.DS_Store and /dev/null differ
diff --git a/public/index.html b/public/index.html
index 6a20a17a11d1aa363c2ef0dad0dc561f1ada0ab5..e9808ad9d9b00886f380bdc74a16e529731b7e9f 100644 (file)
--- a/public/index.html
+++ b/public/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html class="no-js">
        <head>
+               <title>FinalsClub.org: Online Social Note-Taking</title>
                <link rel="stylesheet" href="/assets/css/include.css" type="text/css" media="screen" />
                <script type="text/javascript" src="/assets/js/modernizr.custom.js"></script>
                <script type="text/javascript" src="/assets/js/load.js"></script>
@@ -667,4 +668,3 @@
                </div>
        </body>
 </html>
-<html><body></body></html>
\ No newline at end of file
Unnamed repository; edit this file 'description' to name the repository.