Skip to content
Snippets Groups Projects
Commit 2f3bd5b3 authored by jfederico's avatar jfederico
Browse files

Reformatted files with conflicts

parent 1edc10f0
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3095 additions and 3054 deletions
.gitignore
+ 2
− 0
View file @ 2f3bd5b3
......@@ -23,3 +23,5 @@ bigbluebutton-web/.classpath
bigbluebutton-web/.project
akka-bbb-apps/akka-bbb-apps*.log
bigbluebutton-html5/log/development.log
bigbluebutton-web/target-eclipse*
record-and-playback/.loadpath
bigbluebutton-web/.settings/org.codehaus.groovy.eclipse.preferences.prefs deleted 100644 → 0
+ 0
− 4
View file @ 1edc10f0
#Thu Nov 12 15:28:10 EST 2009
eclipse.preferences.version=1
groovy.compiler.output.path=bin-groovy
support.groovy=true
bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs deleted 100644 → 0
+ 0
− 3
View file @ 1edc10f0
#Thu Sep 03 13:19:16 EDT 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.groovy
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net