Skip to content

I
InstiApp
Commit 241cf8e3 authored by sshivam95's avatar sshivam95
Browse files
Options

Merge remote-tracking branch 'origin/nss' into nss 

# Conflicts:
#	app/src/main/java/app/insti/TagClass.java
parents b514005a 89cc0236
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
app/src/main/java/app/insti/TagClass.java
View file @ 241cf8e3
...@@ -18,4 +18,4 @@ public class TagClass { ...@@ -18,4 +18,4 @@ public class TagClass {
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
} }
\ No newline at end of file
Markdown is supported
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