Fixes the latest merge

This commit is contained in:
Paul Schneider
2015-10-19 21:41:13 +02:00
parent 2963e2c4a0
commit d8a5ebd526
11 changed files with 72 additions and 64 deletions

View File

@ -94,12 +94,6 @@ namespace Yavsc.Model {
}
}
public static string Count {
get {
return ResourceManager.GetString("Count", resourceCulture);
}
}
public static string ProviderName {
get {
return ResourceManager.GetString("ProviderName", resourceCulture);
@ -124,6 +118,12 @@ namespace Yavsc.Model {
}
}
public static string DoComment {
get {
return ResourceManager.GetString("DoComment", resourceCulture);
}
}
public static string Members {
get {
return ResourceManager.GetString("Members", resourceCulture);
@ -136,9 +136,9 @@ namespace Yavsc.Model {
}
}
public static string younotadmin {
public static string Welcome {
get {
return ResourceManager.GetString("younotadmin", resourceCulture);
return ResourceManager.GetString("Welcome", resourceCulture);
}
}
@ -238,6 +238,12 @@ namespace Yavsc.Model {
}
}
public static string younotadmin {
get {
return ResourceManager.GetString("younotadmin", resourceCulture);
}
}
public static string Tag_name {
get {
return ResourceManager.GetString("Tag_name", resourceCulture);
@ -304,9 +310,9 @@ namespace Yavsc.Model {
}
}
public static string Welcome {
public static string Count {
get {
return ResourceManager.GetString("Welcome", resourceCulture);
return ResourceManager.GetString("Count", resourceCulture);
}
}