From d8aa15fadae468e71cbd0029d60774062f1ebac3 Mon Sep 17 00:00:00 2001 From: John Tibbetts Date: Wed, 22 Apr 2015 16:34:54 -0700 Subject: [PATCH] update to LTI-Reference for changed files --- .gitignore | 33 ++++++---------------------- LTI2-Reference.iml | 46 ++++++++++++++++++++++++++++++++++++++++ tc_sample_app/.gitignore | 1 + 3 files changed, 53 insertions(+), 27 deletions(-) create mode 100644 LTI2-Reference.iml diff --git a/.gitignore b/.gitignore index 93e5b4c..050c9d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,38 +1,17 @@ -# See http://help.github.com/ignore-files/ for more about ignoring files. +# See https://help.github.com/articles/ignoring-files for more about ignoring files. # # If you find yourself ignoring temporary files generated by your text editor # or operating system, you probably want to add a global ignore instead: -# git config --global core.excludesfile ~/.gitignore_global +# git config --global core.excludesfile '~/.gitignore_global' -# Ignore bundler config +# Ignore bundler config. /.bundle # Ignore the default SQLite database. /db/*.sqlite3 +/db/*.sqlite3-journal # Ignore all logfiles and tempfiles. -/log/*.log +/log/* +!/log/.keep /tmp -log - -.idea/ -.project -.powrc -.rspec -.rvmrc - -public/files - -.rvmrc -.powrc -======= -public/files - -.powrc -.rvmrc -.idea -<<<<<<< HEAD -public/wirelog.html - -======= ->>>>>>> f830eafb4549c1542e2a811fc70db676feea66a2 diff --git a/LTI2-Reference.iml b/LTI2-Reference.iml new file mode 100644 index 0000000..8cbf9d3 --- /dev/null +++ b/LTI2-Reference.iml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tc_sample_app/.gitignore b/tc_sample_app/.gitignore index c2f2541..b6db59c 100644 --- a/tc_sample_app/.gitignore +++ b/tc_sample_app/.gitignore @@ -31,6 +31,7 @@ public/files .powrc .rvmrc .idea +*.iml public/wirelog.html