Skip to content

Dec1 oghw - #29

Open
trebryan wants to merge 5 commits into
masterfrom
Dec1OGHW
Open

Dec1 oghw#29
trebryan wants to merge 5 commits into
masterfrom
Dec1OGHW

Conversation

@trebryan

@trebryan trebryan commented Dec 3, 2016

Copy link
Copy Markdown

No description provided.

Mitch Kahn and others added 5 commits October 24, 2016 17:37
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/io/ourglass/amstelbright2/core/OGSystem.java
#	app/src/main/java/io/ourglass/amstelbright2/realm/OGApp.java
#	app/src/main/java/io/ourglass/amstelbright2/tvui/MainframeActivity.java
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/io/ourglass/amstelbright2/core/OGSystem.java
#	app/src/main/java/io/ourglass/amstelbright2/realm/OGApp.java
#	app/src/main/java/io/ourglass/amstelbright2/tvui/MainframeActivity.java
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
@mkahn-optv

Copy link
Copy Markdown
Collaborator

Why is Treb creating pull requests?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants