Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of github.com:btelles/example_reporter

Conflicts:
	.gitmodules
	vendor/plugins/reporter
  • Loading branch information...
commit df36afe6ef6f9b487ab7968478e4de22677b14a3 2 parents d0c54ed + f0af4c1
authored October 07, 2010
2  .gitmodules
... ...
@@ -1,3 +1,3 @@
1 1
 [submodule "vendor/plugins/reporter"]
2 2
 	path = vendor/plugins/reporter
3  
-	url = git@github.com:btelles/reporter.git
  3
+	url = git@github.com:btelles/reporter
3  db/migrate/20100804192818_create_reports.rb
@@ -3,7 +3,8 @@ def self.up
3 3
     create_table :reports do |t|
4 4
       t.string :name
5 5
       t.string :description
6  
-
  6
+      t.string :code
  7
+      t.string :columns
7 8
       t.timestamps
8 9
     end
9 10
   end
2  vendor/plugins/reporter
... ...
@@ -1 +1 @@
1  
-Subproject commit a88d52b2693715227573315f18a9232517dc6ae2
  1
+Subproject commit e6350f4f1dd0f879bdcbf6d4de11762d02939ba8

0 notes on commit df36afe

Please sign in to comment.
Something went wrong with that request. Please try again.